| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.php |
| — | — | @@ -140,11 +140,11 @@ |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | function efCentralNoticeLoader( $out, $skin ) { |
| 144 | | - global $wgUser, $wgOut; |
| | 144 | + global $wgUser, $wgOut, $wgCentralDBname; |
| 145 | 145 | |
| 146 | 146 | $centralLoader = SpecialPage::getTitleFor( 'BannerController' )->getLocalUrl(); |
| 147 | 147 | |
| 148 | | - $dbr = wfGetDB( DB_SLAVE ); |
| | 148 | + $dbr = wfGetDB( DB_SLAVE, array(), $wgCentralDBname ); |
| 149 | 149 | $row = $dbr->selectRow( 'cn_notices', 'not_name', array( 'not_enabled = 1', 'not_geo = 1' ) ); |
| 150 | 150 | if ( $row ) { |
| 151 | 151 | $wgOut->addScriptFile( 'http://geoiplookup.wikimedia.org/' ); |
| Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 152 | 152 | Merged /trunk/extensions/CentralNotice:r73994-73995 |