Reverting r16861; incompatible change to message texts, breaks a lot of toggle displa...

[lhc/web/wiklou.git] / includes / ProtectionForm.php

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 3f7a0fd..fd1bc81 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @package MediaWiki
@@ -65,7 +65,7 @@ class ProtectionForm {
                if( is_null( $this->mTitle ) ||
                        !$this->mTitle->exists() ||
                        $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                       $wgOut->fatalError( wfMsg( 'badarticleerror' ) );
+                       $wgOut->showFatalError( wfMsg( 'badarticleerror' ) );
                        return;
                }
 
@@ -79,7 +79,7 @@ class ProtectionForm {
 
                $wgOut->addWikiText(
                        wfMsg( $this->disabled ? "protect-viewtext" : "protect-text",
-                               $this->mTitle->getPrefixedText() ) );
+                               wfEscapeWikiText( $this->mTitle->getPrefixedText() ) ) );
 
                $wgOut->addHTML( $this->buildForm() );
 
@@ -87,7 +87,7 @@ class ProtectionForm {
        }
 
        function save() {
-               global $wgRequest, $wgUser;
+               global $wgRequest, $wgUser, $wgOut;
                if( !$wgRequest->wasPosted() ) {
                        return false;
                }
@@ -98,13 +98,12 @@ class ProtectionForm {
 
                $token = $wgRequest->getVal( 'wpEditToken' );
                if( !$wgUser->matchEditToken( $token ) ) {
-                       $wgOut->fatalError( wfMsg( 'sessionfailure' ) );
-                       return false;
+                       throw new FatalError( wfMsg( 'sessionfailure' ) );
                }
 
                $ok = $this->mArticle->updateRestrictions( $this->mRestrictions, $this->mReason );
                if( !$ok ) {
-                       $wgOut->fatalError( "Unknown error at restriction save time." );
+                       throw new FatalError( "Unknown error at restriction save time." );
                }
                return $ok;
        }
@@ -132,7 +131,8 @@ class ProtectionForm {
                $out .= "<tbody>";
                $out .= "<tr>\n";
                foreach( $this->mRestrictions as $action => $required ) {
-                       $out .= "<th>" . wfMsgHtml( $action ) . "</th>\n";
+                       /* Not all languages have V_x <-> N_x relation */
+                       $out .= "<th>" . wfMsgHtml( 'restriction-' . $action ) . "</th>\n";
                }
                $out .= "</tr>\n";
                $out .= "<tr>\n";
@@ -230,7 +230,6 @@ class ProtectionForm {
        function showLogExtract( &$out ) {
                # Show relevant lines from the deletion log:
                $out->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'protect' ) ) . "</h2>\n" );
-               require_once( 'SpecialLog.php' );
                $logViewer = new LogViewer(
                        new LogReader(
                                new FauxRequest(
@@ -241,4 +240,4 @@ class ProtectionForm {
 }
 
 
-?>
\ No newline at end of file
+?>