| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2804,16 +2804,21 @@ |
| 2805 | 2805 | |
| 2806 | 2806 | $wgOut->setPagetitle( $page->getPrefixedText() ); |
| 2807 | 2807 | $wgOut->setPageTitleActionText( wfMsg( 'info_short' ) ); |
| 2808 | | - $wgOut->setSubtitle( wfMsg( 'infosubtitle' )); |
| | 2808 | + $wgOut->setSubtitle( wfMsg( 'infosubtitle' ) ); |
| 2809 | 2809 | |
| 2810 | | - # first, see if the page exists at all. |
| 2811 | | - $exists = $page->getArticleId() != 0; |
| 2812 | | - if( !$exists ) { |
| 2813 | | - if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { |
| 2814 | | - $wgOut->addHTML(wfMsgWeirdKey ( $this->mTitle->getText() ) ); |
| | 2810 | + if( !$this->mTitle->exists() ) { |
| | 2811 | + $wgOut->addHtml( '<div class="noarticletext">' ); |
| | 2812 | + if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { |
| | 2813 | + // This doesn't quite make sense; the user is asking for |
| | 2814 | + // information about the _page_, not the message... -- RC |
| | 2815 | + $wgOut->addHtml( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) ); |
| 2815 | 2816 | } else { |
| 2816 | | - $wgOut->addHTML(wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ) ); |
| | 2817 | + $msg = $wgUser->isLoggedIn() |
| | 2818 | + ? 'noarticletext' |
| | 2819 | + : 'noarticletextanon'; |
| | 2820 | + $wgOut->addHtml( wfMsgExt( $msg, 'parse' ) ); |
| 2817 | 2821 | } |
| | 2822 | + $wgOut->addHtml( '</div>' ); |
| 2818 | 2823 | } else { |
| 2819 | 2824 | $dbr = wfGetDB( DB_SLAVE ); |
| 2820 | 2825 | $wl_clause = array( |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -334,6 +334,10 @@ |
| 335 | 335 | * Fixed leading zero in base 36 SHA-1 hash |
| 336 | 336 | * Protection form no longer produces JavaScript errors |
| 337 | 337 | * (bug 10741) File histories show "delete" links for non-sysops |
| | 338 | +* (bug 10744) Treat "noarticletext" and "noarticletextanon" as wiki text when |
| | 339 | + used on a non-existent page with "action=info" |
| | 340 | +* Fix escaping of raw message text when used on a non-existent page with |
| | 341 | + "action=info" |
| 338 | 342 | |
| 339 | 343 | == API changes since 1.10 == |
| 340 | 344 | |