* replace use of deprecated makeLinkObj() by link() in core

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

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 8508831..e4ca0d7 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -20,7 +20,7 @@
  */
 
 /**
- * @todo document, briefly.
+ * Handles the page protection UI and backend
  */
 class ProtectionForm {
        /** A map of action to restriction level, from request or default */
@@ -192,11 +192,11 @@ class ProtectionForm {
                                $titles .= '* [[:' . $title->getPrefixedText() . "]]\n";
                        }
 
-                       $wgOut->wrapWikiMsg( "$1\n$titles", array( 'protect-cascadeon', count($cascadeSources) ) );
+                       $wgOut->wrapWikiMsg( "<div id=\"mw-protect-cascadeon\">\n$1\n" . $titles . "</div>", array( 'protect-cascadeon', count($cascadeSources) ) );
                }
 
                $sk = $wgUser->getSkin();
-               $titleLink = $sk->makeLinkObj( $this->mTitle );
+               $titleLink = $sk->link( $this->mTitle );
                $wgOut->setPageTitle( wfMsg( 'protect-title', $this->mTitle->getPrefixedText() ) );
                $wgOut->setSubtitle( wfMsg( 'protect-backlink', $titleLink ) );
 
@@ -218,7 +218,7 @@ class ProtectionForm {
        }
 
        function save() {
-               global $wgRequest, $wgUser, $wgOut;
+               global $wgRequest, $wgUser;
                # Permission check!
                if ( $this->disabled ) {
                        $this->show();
@@ -235,13 +235,15 @@ class ProtectionForm {
                $reasonstr = $this->mReasonSelection;
                if ( $reasonstr != 'other' && $this->mReason != '' ) {
                        // Entry from drop down menu + additional comment
-                       $reasonstr .= ': ' . $this->mReason;
+                       $reasonstr .= wfMsgForContent( 'colon-separator' ) . $this->mReason;
                } elseif ( $reasonstr == 'other' ) {
                        $reasonstr = $this->mReason;
                }
                $expiry = array();
                foreach( $this->mApplicableTypes as $action ) {
                        $expiry[$action] = $this->getExpiry( $action );
+                       if( empty($this->mRestrictions[$action]) )
+                               continue; // unprotected
                        if ( !$expiry[$action] ) {
                                $this->show( wfMsg( 'protect_expiry_invalid' ) );
                                return false;
@@ -322,7 +324,7 @@ class ProtectionForm {
                                wfMsgForContent( 'protect-otherreason-op' ), 
                                $this->mReasonSelection,
                                'mwProtect-reason', 4 );
-                       $scExpiryOptions = wfMsgForContent( 'ipboptions' ); // FIXME: use its own message
+                       $scExpiryOptions = wfMsgForContent( 'protect-expiry-options' );
 
                        $showProtectOptions = ($scExpiryOptions !== '-' && !$this->disabled);
 
@@ -331,9 +333,12 @@ class ProtectionForm {
 
                        $expiryFormOptions = '';
                        if ( $this->mExistingExpiry[$action] && $this->mExistingExpiry[$action] != 'infinity' ) {
+                               $timestamp = $wgLang->timeanddate( $this->mExistingExpiry[$action] );
+                               $d = $wgLang->date( $this->mExistingExpiry[$action] );
+                               $t = $wgLang->time( $this->mExistingExpiry[$action] );
                                $expiryFormOptions .= 
                                        Xml::option( 
-                                               wfMsg( 'protect-existing-expiry', $wgLang->timeanddate( $this->mExistingExpiry[$action] ) ),
+                                               wfMsg( 'protect-existing-expiry', $timestamp, $d, $t ),
                                                'existing',
                                                $this->mExpirySelection[$action] == 'existing'
                                        ) . "\n";
@@ -369,7 +374,8 @@ class ProtectionForm {
                                        </tr></table>";
                        }
                        # Add custom expiry field
-                       $attribs = array( 'id' => "mwProtect-$action-expires", 'onkeyup' => 'ProtectionForm.updateExpiry(this)' ) + $this->disabledAttrib;
+                       $attribs = array( 'id' => "mwProtect-$action-expires",
+                               'onkeyup' => 'ProtectionForm.updateExpiry(this)' ) + $this->disabledAttrib;
                        $out .= "<table><tr>
                                        <td class='mw-label'>" .
                                                $mProtectother .
@@ -441,8 +447,13 @@ class ProtectionForm {
                $out .= Xml::closeElement( 'fieldset' );
 
                if ( $wgUser->isAllowed( 'editinterface' ) ) {
-                       $linkTitle = Title::makeTitleSafe( NS_MEDIAWIKI, 'protect-dropdown' );
-                       $link = $wgUser->getSkin()->Link ( $linkTitle, wfMsgHtml( 'protect-edit-reasonlist' ) );
+                       $title = Title::makeTitle( NS_MEDIAWIKI, 'Protect-dropdown' );
+                       $link = $wgUser->getSkin()->link(
+                               $title,
+                               wfMsgHtml( 'protect-edit-reasonlist' ),
+                               array(),
+                               array( 'action' => 'edit' )
+                       );
                        $out .= '<p class="mw-protect-editreasons">' . $link . '</p>';
                }