| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.db.php |
| — | — | @@ -27,9 +27,9 @@ |
| 28 | 28 | $dbr = wfGetDB( DB_SLAVE, array(), $wgCentralDBname ); |
| 29 | 29 | |
| 30 | 30 | if ( !$date ) { |
| 31 | | - $encTimestamp = $dbr->timestamp(); |
| | 31 | + $encTimestamp = $dbr->addQuotes( $dbr->timestamp() ); |
| 32 | 32 | } else { |
| 33 | | - $encTimestamp = $dbr->timestamp( $date ); |
| | 33 | + $encTimestamp = $dbr->addQuotes( $dbr->timestamp( $date ) ); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | $tables = array( 'cn_notices' ); |
| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerLoader.php |
| — | — | @@ -104,8 +104,12 @@ |
| 105 | 105 | */ |
| 106 | 106 | function getNoticeField( $match ) { |
| 107 | 107 | $field = $match[1]; |
| | 108 | + $params = array(); |
| | 109 | + if ( $field == 'amount' ) { |
| | 110 | + $params = array( $this->formatNum( $this->getDonationAmount() ) ); |
| | 111 | + } |
| 108 | 112 | $message = "centralnotice-{$this->bannerName}-$field"; |
| 109 | | - $source = $this->getMessage( $message ); |
| | 113 | + $source = $this->getMessage( $message, $params ); |
| 110 | 114 | return $source; |
| 111 | 115 | } |
| 112 | 116 | |
| — | — | @@ -126,25 +130,25 @@ |
| 127 | 131 | * @param $msg The full name of the message |
| 128 | 132 | * @return translated messsage string |
| 129 | 133 | */ |
| 130 | | - private function getMessage( $msg ) { |
| 131 | | - global $wgLang; |
| 132 | | - |
| | 134 | + private function getMessage( $msg, $params = array() ) { |
| | 135 | + global $wgLang, $wgSitename; |
| | 136 | + |
| 133 | 137 | // A god-damned dirty hack! :D |
| 134 | 138 | $oldLang = $wgLang; |
| | 139 | + $oldSitename = $wgSitename; |
| 135 | 140 | |
| | 141 | + $wgSitename = $this->siteName; // hack for {{SITENAME}} |
| 136 | 142 | $wgLang = Language::factory( $this->language ); // hack for {{int:...}} |
| 137 | | - $out = wfMsgExt( $msg, array( 'language' => $this->language, 'parsemag' ) ); |
| 138 | 143 | |
| 139 | | - // Restore global |
| | 144 | + $options = array( 'language' => $this->language, 'parsemag' ); |
| | 145 | + array_unshift( $params, $options ); |
| | 146 | + array_unshift( $params, $msg ); |
| | 147 | + $out = call_user_func_array( 'wfMsgExt', $params ); |
| | 148 | + |
| | 149 | + // Restore global variables |
| 140 | 150 | $wgLang = $oldLang; |
| 141 | | - |
| 142 | | - // Replace variables in banner with values |
| 143 | | - $amountSub = strpos( $out, '$amount'); |
| 144 | | - if ( $amountSub !== false ) { |
| 145 | | - $out = str_replace( '$amount', $this->formatNum( $this->getDonationAmount() ), $out ); |
| 146 | | - } |
| 147 | | - $out = str_replace( '$sitename', $this->siteName, $out ); |
| 148 | | - |
| | 151 | + $wgSitename = $oldSitename; |
| | 152 | + |
| 149 | 153 | return $out; |
| 150 | 154 | } |
| 151 | 155 | |
| Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 152 | 156 | Merged /trunk/extensions/CentralNotice:r73959 |