| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -714,7 +714,7 @@ |
| 715 | 715 | $message = end($message); |
| 716 | 716 | } |
| 717 | 717 | if ( $msg->exists() ) { |
| 718 | | - $text = $msg->plain(); |
| | 718 | + $text = $msg->text(); |
| 719 | 719 | } else { |
| 720 | 720 | global $wgContLang; |
| 721 | 721 | $text = $wgContLang->getFormattedNsText( MWNamespace::getSubject( $title->getNamespace() ) ); |
| — | — | @@ -885,7 +885,7 @@ |
| 886 | 886 | "edit" : "create"; |
| 887 | 887 | $content_navigation['views']['edit'] = array( |
| 888 | 888 | 'class' => ( $selected ? 'selected' : '' ) . $isTalkClass, |
| 889 | | - 'text' => wfMessageFallback( "$skname-view-$msgKey", $msgKey )->plain(), |
| | 889 | + 'text' => wfMessageFallback( "$skname-view-$msgKey", $msgKey )->text(), |
| 890 | 890 | 'href' => $title->getLocalURL( $this->editUrlOptions() ), |
| 891 | 891 | 'primary' => true, // don't collapse this in vector |
| 892 | 892 | ); |
| — | — | @@ -898,7 +898,7 @@ |
| 899 | 899 | //$content_navigation['actions']['addsection'] |
| 900 | 900 | $content_navigation['views']['addsection'] = array( |
| 901 | 901 | 'class' => $section == 'new' ? 'selected' : false, |
| 902 | | - 'text' => wfMessageFallback( "$skname-action-addsection", 'addsection' )->plain(), |
| | 902 | + 'text' => wfMessageFallback( "$skname-action-addsection", 'addsection' )->text(), |
| 903 | 903 | 'href' => $title->getLocalURL( 'action=edit§ion=new' ) |
| 904 | 904 | ); |
| 905 | 905 | } |
| — | — | @@ -908,7 +908,7 @@ |
| 909 | 909 | // Adds view source view link |
| 910 | 910 | $content_navigation['views']['viewsource'] = array( |
| 911 | 911 | 'class' => ( $onPage && $action == 'edit' ) ? 'selected' : false, |
| 912 | | - 'text' => wfMessageFallback( "$skname-action-viewsource", 'viewsource' )->plain(), |
| | 912 | + 'text' => wfMessageFallback( "$skname-action-viewsource", 'viewsource' )->text(), |
| 913 | 913 | 'href' => $title->getLocalURL( $this->editUrlOptions() ), |
| 914 | 914 | 'primary' => true, // don't collapse this in vector |
| 915 | 915 | ); |
| — | — | @@ -922,7 +922,7 @@ |
| 923 | 923 | // Adds history view link |
| 924 | 924 | $content_navigation['views']['history'] = array( |
| 925 | 925 | 'class' => ( $onPage && $action == 'history' ) ? 'selected' : false, |
| 926 | | - 'text' => wfMessageFallback( "$skname-view-history", 'history_short' )->plain(), |
| | 926 | + 'text' => wfMessageFallback( "$skname-view-history", 'history_short' )->text(), |
| 927 | 927 | 'href' => $title->getLocalURL( 'action=history' ), |
| 928 | 928 | 'rel' => 'archives', |
| 929 | 929 | ); |
| — | — | @@ -930,7 +930,7 @@ |
| 931 | 931 | if( $wgUser->isAllowed( 'delete' ) ) { |
| 932 | 932 | $content_navigation['actions']['delete'] = array( |
| 933 | 933 | 'class' => ( $onPage && $action == 'delete' ) ? 'selected' : false, |
| 934 | | - 'text' => wfMessageFallback( "$skname-action-delete", 'delete' )->plain(), |
| | 934 | + 'text' => wfMessageFallback( "$skname-action-delete", 'delete' )->text(), |
| 935 | 935 | 'href' => $title->getLocalURL( 'action=delete' ) |
| 936 | 936 | ); |
| 937 | 937 | } |
| — | — | @@ -938,7 +938,7 @@ |
| 939 | 939 | $moveTitle = SpecialPage::getTitleFor( 'Movepage', $title->getPrefixedDBkey() ); |
| 940 | 940 | $content_navigation['actions']['move'] = array( |
| 941 | 941 | 'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false, |
| 942 | | - 'text' => wfMessageFallback( "$skname-action-move", 'move' )->plain(), |
| | 942 | + 'text' => wfMessageFallback( "$skname-action-move", 'move' )->text(), |
| 943 | 943 | 'href' => $moveTitle->getLocalURL() |
| 944 | 944 | ); |
| 945 | 945 | } |
| — | — | @@ -947,7 +947,7 @@ |
| 948 | 948 | $mode = !$title->isProtected() ? 'protect' : 'unprotect'; |
| 949 | 949 | $content_navigation['actions'][$mode] = array( |
| 950 | 950 | 'class' => ( $onPage && $action == $mode ) ? 'selected' : false, |
| 951 | | - 'text' => wfMessageFallback( "$skname-action-$mode", $mode )->plain(), |
| | 951 | + 'text' => wfMessageFallback( "$skname-action-$mode", $mode )->text(), |
| 952 | 952 | 'href' => $title->getLocalURL( "action=$mode" ) |
| 953 | 953 | ); |
| 954 | 954 | } |
| — | — | @@ -972,7 +972,7 @@ |
| 973 | 973 | $mode = !$title->getRestrictions( 'create' ) ? 'protect' : 'unprotect'; |
| 974 | 974 | $content_navigation['actions'][$mode] = array( |
| 975 | 975 | 'class' => ( $onPage && $action == $mode ) ? 'selected' : false, |
| 976 | | - 'text' => wfMessageFallback( "$skname-action-$mode", $mode )->plain(), |
| | 976 | + 'text' => wfMessageFallback( "$skname-action-$mode", $mode )->text(), |
| 977 | 977 | 'href' => $title->getLocalURL( "action=$mode" ) |
| 978 | 978 | ); |
| 979 | 979 | } |