Changeset 4109

Show
Ignore:
Timestamp:
Sat Nov 26 23:11:00 2005
Author:
paul
Message:

Fixed bug #1558 - Article events will still take place even if article is in the NEW state.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/campsite/implementation/management/classes/ArticlePublish.php

    r4085 r4109  
    279 279         global $Campsite;  
    280 280         $datetime = strftime("%Y-%m-%d %H:%M:00");  
    281           $queryStr = "SELECT * FROM ArticlePublish "  
    282                       . " WHERE time_action <= '$datetime'"  
    283                       . " AND is_completed != 'Y'"  
    284                       . " ORDER BY time_action ASC";  
      281         $queryStr = "SELECT * FROM ArticlePublish, Articles "  
      282                     . " WHERE ArticlePublish.time_action <= '$datetime'"  
      283                     . " AND ArticlePublish.is_completed != 'Y'"  
      284                     . " AND Articles.Published != 'N'"  
      285                     . " ORDER BY ArticlePublish.time_action ASC";  
    285 286         $result = DbObjectArray::Create('ArticlePublish', $queryStr);  
    286 287         return $result;  
    316 317         $queryStr = "SELECT id, time_action, publish_action, publish_on_front_page, publish_on_section_page,"  
    317 318                     . implode(",", $columnNames). " FROM Articles, ArticlePublish "  
    318                       . " WHERE time_action >= '" . $datetime . "'"  
    319                       . " AND is_completed != 'Y'"  
      319                     . " WHERE ArticlePublish.time_action >= '" . $datetime . "'"  
      320                     . " AND ArticlePublish.is_completed != 'Y'"  
      321                     . " AND Articles.Published != 'N'"  
    320 322                     . " AND Articles.Number=ArticlePublish.fk_article_number "  
    321 323                     . " AND Articles.IdLanguage=ArticlePublish.fk_language_id "