| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -847,7 +847,7 @@ |
| 848 | 848 | $this->enableClientCache( false ); |
| 849 | 849 | $this->mRedirect = ''; |
| 850 | 850 | $this->mBodytext = ''; |
| 851 | | - $this->addWikitext( $this->formatPermissionsErrorMessage( $errors ) ); |
| | 851 | + $this->addHTML( $this->formatPermissionsErrorMessage( $errors ) ); |
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | /** @deprecated */ |
| — | — | @@ -905,12 +905,12 @@ |
| 906 | 906 | case 0: |
| 907 | 907 | case 1: |
| 908 | 908 | case 2: |
| 909 | | - $message = wfMsg( "badaccess-group$n", $groups ); |
| | 909 | + $message = wfMsgHtml( "badaccess-group$n", $groups ); |
| 910 | 910 | break; |
| 911 | 911 | default: |
| 912 | | - $message = wfMsg( 'badaccess-groups', $groups ); |
| | 912 | + $message = wfMsgHtml( 'badaccess-groups', $groups ); |
| 913 | 913 | } |
| 914 | | - $this->addHtml( $message ); |
| | 914 | + #$this->addHtml( $message ); |
| 915 | 915 | $this->returnToMain( false ); |
| 916 | 916 | } |
| 917 | 917 | |
| — | — | @@ -995,6 +995,8 @@ |
| 996 | 996 | * @todo document |
| 997 | 997 | * @param bool $protected Is the reason the page can't be reached because it's protected? |
| 998 | 998 | * @param mixed $source |
| | 999 | + * @param bool $protected, page is protected? |
| | 1000 | + * @param array $reason, array of arrays( msg, args ) |
| 999 | 1001 | */ |
| 1000 | 1002 | public function readOnlyPage( $source = null, $protected = false, $reasons = array() ) { |
| 1001 | 1003 | global $wgUser, $wgReadOnlyFile, $wgReadOnly, $wgTitle; |
| — | — | @@ -1002,12 +1004,12 @@ |
| 1003 | 1005 | |
| 1004 | 1006 | $this->setRobotpolicy( 'noindex,nofollow' ); |
| 1005 | 1007 | $this->setArticleRelated( false ); |
| 1006 | | - |
| 1007 | | - if ($reasons != array()) { |
| | 1008 | + |
| | 1009 | + if ( !empty($reasons) ) { |
| 1008 | 1010 | $this->setPageTitle( wfMsg( 'viewsource' ) ); |
| 1009 | 1011 | $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); |
| 1010 | 1012 | |
| 1011 | | - $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons ) ); |
| | 1013 | + $this->addHTML( $this->formatPermissionsErrorMessage( $reasons ) ); |
| 1012 | 1014 | } else if( $protected ) { |
| 1013 | 1015 | $this->setPageTitle( wfMsg( 'viewsource' ) ); |
| 1014 | 1016 | $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); |