| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialBannerController.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/extensions/CentralNotice/special/SpecialBannerController.php:r92767 |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialCentralNotice.php |
| — | — | @@ -1255,7 +1255,8 @@ |
| 1256 | 1256 | * Lookup the name of a campaign based on the campaign ID |
| 1257 | 1257 | */ |
| 1258 | 1258 | public static function getNoticeName( $noticeId ) { |
| 1259 | | - $dbr = wfGetDB( DB_SLAVE ); |
| | 1259 | + // Read from the master database to avoid concurrency problems |
| | 1260 | + $dbr = wfGetDB( DB_MASTER ); |
| 1260 | 1261 | if ( is_numeric( $noticeId ) ) { |
| 1261 | 1262 | $row = $dbr->selectRow( 'cn_notices', 'not_name', array( 'not_id' => $noticeId ) ); |
| 1262 | 1263 | if ( $row ) { |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialBannerLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1263 | 1264 | Merged /trunk/extensions/CentralNotice/special/SpecialBannerLoader.php:r92767 |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1264 | 1265 | Merged /trunk/extensions/CentralNotice/CentralNotice.php:r92767 |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.sql |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1265 | 1266 | Merged /trunk/extensions/CentralNotice/CentralNotice.sql:r92767 |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.db.php |
| — | — | @@ -128,7 +128,8 @@ |
| 129 | 129 | static function getCampaignSettings( $campaignName, $detailed = true ) { |
| 130 | 130 | global $wgCentralDBname; |
| 131 | 131 | |
| 132 | | - $dbr = wfGetDB( DB_SLAVE, array(), $wgCentralDBname ); |
| | 132 | + // Read from the master database to avoid concurrency problems |
| | 133 | + $dbr = wfGetDB( DB_MASTER, array(), $wgCentralDBname ); |
| 133 | 134 | |
| 134 | 135 | $campaign = array(); |
| 135 | 136 | |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 136 | 137 | Merged /trunk/extensions/CentralNotice:r92767 |