Changeset 3597

Show
Ignore:
Timestamp:
11/19/09 15:16:06 (11 years ago)
Author:
marcio.galvao
Message:
 
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/classes/submission/author/AuthorSubmissionDAO.inc.php

    r3526 r3597  
    285285                                ax.journal_article_id 
    286286                        FROM articles a 
     287<<<<<<< .mine 
     288                        LEFT JOIN articles_extension ax ON (a.article_id = ax.article_id) 
     289                        LEFT JOIN sections s ON (s.section_id = a.section_id)  
     290                        LEFT JOIN copyed_assignments c on (a.article_id = c.article_id and c.copyeditor_id > 0)  
     291                        LEFT JOIN section_settings stpl ON (s.section_id = stpl.section_id AND stpl.setting_name = ? AND stpl.locale = ?) 
     292                        LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?) 
     293                        LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?) 
     294                        LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?) 
     295======= 
    287296                LEFT JOIN articles_extension ax ON (a.article_id = ax.article_id)        
    288297                LEFT JOIN sections s ON (s.section_id = a.section_id)  
     
    292301                                LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?) 
    293302                                LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?) 
     303>>>>>>> .r3596 
    294304                        WHERE   a.user_id = ? AND a.journal_id = ? AND ' . 
    295305                        ($active?'a.status = 1':'(a.status <> 1 AND a.submission_progress = 0)'), 
     
    308318                        $rangeInfo 
    309319                ); 
    310                  
     320<<<<<<< .mine 
     321 
     322======= 
     323                 
     324>>>>>>> .r3596 
    311325                $returner = &new DAOResultFactory($result, $this, '_returnAuthorSubmissionFromRow'); 
     326 
    312327                return $returner; 
    313328        }