| Index: trunk/extensions/CentralNotice/SpecialBannerLoader.php |
| — | — | @@ -35,12 +35,12 @@ |
| 36 | 36 | $content = $this->getHtmlNotice( $bannerName, $standAlone ); |
| 37 | 37 | if ( strlen( $content ) == 0 ) { |
| 38 | 38 | // Hack for IE/Mac 0-length keepalive problem, see RawPage.php |
| 39 | | - echo "/* Empty */"; |
| | 39 | + echo "<!-- Empty -->"; |
| 40 | 40 | } else { |
| 41 | 41 | echo $content; |
| 42 | 42 | } |
| 43 | 43 | } else { |
| 44 | | - echo "/* No banner specified */"; |
| | 44 | + echo "<!-- No banner specified -->"; |
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
| — | — | @@ -146,7 +146,7 @@ |
| 147 | 147 | private function getDonationAmount() { |
| 148 | 148 | global $wgNoticeCounterSource, $wgMemc; |
| 149 | 149 | // Pull short-cached amount |
| 150 | | - $count = intval( $wgMemc->get( 'centralnotice:counter' ) ); |
| | 150 | + $count = intval( wfMemcKey( 'centralnotice', 'counter' ) ); |
| 151 | 151 | if ( !$count ) { |
| 152 | 152 | // Pull from dynamic counter |
| 153 | 153 | wfSuppressWarnings(); |
| — | — | @@ -154,7 +154,7 @@ |
| 155 | 155 | wfRestoreWarnings(); |
| 156 | 156 | if ( !$count ) { |
| 157 | 157 | // Pull long-cached amount |
| 158 | | - $count = intval( $wgMemc->get( 'centralnotice:counter:fallback' ) ); |
| | 158 | + $count = intval( wfMemcKey( 'centralnotice', 'counter', 'fallback' ) ); |
| 159 | 159 | if ( !$count ) { |
| 160 | 160 | // Return hard-coded amount if all else fails |
| 161 | 161 | return 1100000; // Update as needed during fundraiser |