| 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->addHTML( $this->formatPermissionsErrorMessage( $errors ) ); |
| | 851 | + $this->addWikiText( $this->formatPermissionsErrorMessage( $errors ) ); |
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | /** @deprecated */ |
| — | — | @@ -1009,7 +1009,7 @@ |
| 1010 | 1010 | $this->setPageTitle( wfMsg( 'viewsource' ) ); |
| 1011 | 1011 | $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); |
| 1012 | 1012 | |
| 1013 | | - $this->addHTML( $this->formatPermissionsErrorMessage( $reasons ) ); |
| | 1013 | + $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons ) ); |
| 1014 | 1014 | } else if( $protected ) { |
| 1015 | 1015 | $this->setPageTitle( wfMsg( 'viewsource' ) ); |
| 1016 | 1016 | $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1178,12 +1178,11 @@ |
| 1179 | 1179 | ( !$this->isTalkPage() && !$user->isAllowed( 'createpage' ) ) ) { |
| 1180 | 1180 | $errors[] = $user->isAnon() ? array ('nocreatetext') : array ('nocreate-loggedin'); |
| 1181 | 1181 | } |
| 1182 | | - } elseif( $action == 'move' && |
| 1183 | | - !( $this->isMovable() && $user->isAllowed( 'move' ) ) ) { |
| | 1182 | + } elseif( $action == 'move' && !( $this->isMovable() && $user->isAllowed( 'move' ) ) ) { |
| 1184 | 1183 | $errors[] = $user->isAnon() ? array ( 'movenologintext' ) : array ('movenotallowed'); |
| 1185 | | - } else if ( !$user->isAllowed( $action ) ) { |
| | 1184 | + } else if ( !$user->isAllowed( $action ) ) { |
| 1186 | 1185 | $return = null; |
| 1187 | | - $groups = array(); |
| | 1186 | + $groups = array(); |
| 1188 | 1187 | global $wgGroupPermissions; |
| 1189 | 1188 | foreach( $wgGroupPermissions as $key => $value ) { |
| 1190 | 1189 | if( isset( $value[$action] ) && $value[$action] == true ) { |
| — | — | @@ -1191,7 +1190,7 @@ |
| 1192 | 1191 | $groupPage = User::getGroupPage( $key ); |
| 1193 | 1192 | if( $groupPage ) { |
| 1194 | 1193 | $skin = $user->getSkin(); |
| 1195 | | - $groups[] = $skin->makeLinkObj( $groupPage, $groupName ); |
| | 1194 | + $groups[] = '[['.$groupPage->getPrefixedText().'|'.$groupName.']]'; |
| 1196 | 1195 | } else { |
| 1197 | 1196 | $groups[] = $groupName; |
| 1198 | 1197 | } |