| Index: trunk/extensions/CentralNotice/SpecialBannerListLoader.php |
| — | — | @@ -80,7 +80,7 @@ |
| 81 | 81 | |
| 82 | 82 | if ( !$templates && $this->project == 'wikipedia' ) { |
| 83 | 83 | $notices = $this->centralNoticeDB->getNotices( 'wikipedia', $this->language, '', '', 1 ); |
| 84 | | - if ( $notices && is_array( $notices ) ) { |
| | 84 | + if ( $notices ) ) { |
| 85 | 85 | foreach ( $notices as $notice => $val ) { |
| 86 | 86 | $templates = $this->centralNoticeDB->selectTemplatesAssigned( $notice ); |
| 87 | 87 | break; |
| Index: trunk/extensions/CentralNotice/SpecialCentralNotice.php |
| — | — | @@ -1026,11 +1026,12 @@ |
| 1027 | 1027 | array ( |
| 1028 | 1028 | "not_start <= $encTimestamp", |
| 1029 | 1029 | "not_end >= $encTimestamp", |
| 1030 | | - "not_enabled = 1", |
| | 1030 | + 'not_enabled = 1', |
| | 1031 | + 'nc_notice_id = cn_notices.not_id', |
| 1031 | 1032 | "(not_geo = 0) OR ((not_geo = 1) AND (nc_country = '$location'))", |
| 1032 | 1033 | 'nl_notice_id = cn_notices.not_id', |
| 1033 | 1034 | 'nl_language' => $language, |
| 1034 | | - "not_project" => array( '', $project ), |
| | 1035 | + 'not_project' => array( '', $project ), |
| 1035 | 1036 | 'cn_notices.not_id=cn_assignments.not_id', |
| 1036 | 1037 | 'cn_assignments.tmp_id=cn_templates.tmp_id' |
| 1037 | 1038 | ), |