| Property changes on: trunk/phase3/skins/common/images/cyrl |
| ___________________________________________________________________ |
| Deleted: svn:mergeinfo |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -210,7 +210,7 @@ |
| 211 | 211 | * @return Return the text of this revision |
| 212 | 212 | */ |
| 213 | 213 | function getContent() { |
| 214 | | - global $wgOut, $wgMessageCache; |
| | 214 | + global $wgUser, $wgOut, $wgMessageCache; |
| 215 | 215 | |
| 216 | 216 | wfProfileIn( __METHOD__ ); |
| 217 | 217 | |
| — | — | @@ -220,11 +220,12 @@ |
| 221 | 221 | |
| 222 | 222 | if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { |
| 223 | 223 | $wgMessageCache->loadAllMessages(); |
| 224 | | - $ret = wfMsgWeirdKey( $this->mTitle->getText() ); |
| 225 | | - return "<div class='noarticletext'>\n$ret\n</div>"; |
| | 224 | + $ret = wfMsgWeirdKey ( $this->mTitle->getText() ) ; |
| 226 | 225 | } else { |
| 227 | | - return $this->getNoSuchPageText(); |
| | 226 | + $ret = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ); |
| 228 | 227 | } |
| | 228 | + |
| | 229 | + return "<div class='noarticletext'>\n$ret\n</div>"; |
| 229 | 230 | } else { |
| 230 | 231 | $this->loadContent(); |
| 231 | 232 | wfProfileOut( __METHOD__ ); |
| — | — | @@ -232,20 +233,6 @@ |
| 233 | 234 | } |
| 234 | 235 | } |
| 235 | 236 | |
| 236 | | - /* |
| 237 | | - * HACK HACK! We pre-parse them with parsemag to get GRAMMAR working right. |
| 238 | | - * It should be safe to do this and then do the full parse. |
| 239 | | - */ |
| 240 | | - function getNoSuchPageText() { |
| 241 | | - global $wgUser; |
| 242 | | - if ( $wgUser->isLoggedIn() ) { |
| 243 | | - $text = wfMsgExt( 'noarticletext', 'parsemag' ); |
| 244 | | - } else { |
| 245 | | - $text = wfMsgExt( 'noarticletextanon', 'parsemag' ); |
| 246 | | - } |
| 247 | | - return "<div class='noarticletext'>\n$text\n</div>"; |
| 248 | | - } |
| 249 | | - |
| 250 | 237 | /** |
| 251 | 238 | * This function returns the text of a section, specified by a number ($section). |
| 252 | 239 | * A section is text under a heading like == Heading == or \<h1\>Heading\</h1\>, or |
| Property changes on: trunk/phase3/includes/specials/SpecialLinkSearch.php |
| ___________________________________________________________________ |
| Deleted: svn:mergeinfo |
| Property changes on: trunk/phase3/includes/UploadBase.php |
| ___________________________________________________________________ |
| Deleted: svn:mergeinfo |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -213,7 +213,6 @@ |
| 214 | 214 | has been blocked more than 10 times. Patch by Matt Johnston. |
| 215 | 215 | * (bug 12678) Skins don't show Upload link if the user isn't allowed to upload. |
| 216 | 216 | * Fixed incorrect usage of DB_LAST in Special:Export. Deprecated DB_LAST. |
| 217 | | -* 11119 {{grammar}} broken in noarticletext(anon) when ui lang != content lang |
| 218 | 217 | |
| 219 | 218 | === API changes in 1.14 === |
| 220 | 219 | |