diff --git a/main/inc/lib/system_announcements.lib.php b/main/inc/lib/system_announcements.lib.php index 60f64f3ca0..bf25db89e5 100755 --- a/main/inc/lib/system_announcements.lib.php +++ b/main/inc/lib/system_announcements.lib.php @@ -214,21 +214,18 @@ class SystemAnnouncementManager { */ public static function get_all_announcements() { $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS); - $now = api_get_utc_datetime(); - $now = api_get_utc_datetime(); + $now = api_get_utc_datetime(); $sql = "SELECT * FROM ".$db_table." - WHERE ( lang = '$user_selected_language' OR lang IS NULL) AND ( '$now' >= date_start AND '$now' <= date_end) "; - + WHERE ( lang = '$user_selected_language' OR lang IS NULL) AND ( '$now' >= date_start AND '$now' <= date_end) "; global $_configuration; $current_access_url_id = 1; if ($_configuration['multiple_access_urls']) { $current_access_url_id = api_get_current_access_url_id(); } - $sql .= " WHERE access_url_id = '$current_access_url_id' "; - $sql .= " ORDER BY date_start ASC"; - + $sql .= " AND access_url_id = '$current_access_url_id' "; + $sql .= " ORDER BY date_start ASC"; $announcements = Database::query($sql); $all_announcements = array(); while ($announcement = Database::fetch_object($announcements)) {