From: Rob Church <robchurch@users.mediawiki.org>
Date: Thu, 21 Jun 2007 20:50:29 +0000 (+0000)
Subject: * Allow wiki links in "protect-robotspolicy", I imagine people are likely to want... 
X-Git-Tag: 1.31.0-rc.0~52465
X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=commitdiff_plain;h=795ed1c389b8ce0f1191fadb55b97afb1dcd801f;p=lhc%2Fweb%2Fwiklou.git

* Allow wiki links in "protect-robotspolicy", I imagine people are likely to want to link to help
* Typos
---

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index f2a6e018e0..28afcfee31 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -74,11 +74,11 @@ class ProtectionForm {
 				}
 			}
 
-			// Read checkboxex only if user is allowed to change robots policy, otherwise keep previous policy
+			// Read checkboxes only if user is allowed to change robots policy, otherwise keep previous policy
 			if ( $wgUser->isAllowed( 'editrobots' ) ) {
 				$robotspolicy  = $wgRequest->getBool( 'mwProtect-robots-noindex' )  ? 'noindex'   : 'index';
 				$robotspolicy .= $wgRequest->getBool( 'mwProtect-robots-nofollow' ) ? ',nofollow' : ',follow';
-				// 'index,follow' is default, no need to set this explicitly at this point; is done at Article::View
+				// 'index,follow' is default, no need to set this explicitly at this point; is done at Article::view()
 				$this->mRestrictions['robots'] = ( $robotspolicy == 'index,follow' ) ? '' : $robotspolicy;
 			}
 		}
@@ -336,8 +336,8 @@ class ProtectionForm {
 		$noindexset  = ( isset( $this->mRestrictions['robots'] ) && strstr( $this->mRestrictions['robots'], 'noindex' ) )  ? true : false;
 		$nofollowset = ( isset( $this->mRestrictions['robots'] ) && strstr( $this->mRestrictions['robots'], 'nofollow' ) ) ? true : false;
 		$ret = "<tr><td align=\"right\">";
-		$ret .= Xml::label( wfMsg( 'protect-robotspolicy' ), 'mwProtect-robots-label' );
-		$ret .= "</td> <td align=\"left\" width=\"60\">";
+		$ret .= '<label>' . wfMsgExt( 'protect-robotspolicy', array( 'parseinline' ) ) . '</label>';
+		$ret .= "</td><td align=\"left\" width=\"60\">";
 		$ret .= Xml::checkLabel( 'noindex', 'mwProtect-robots-noindex', 'mwProtect-robots-noindex', $noindexset, $robotsallowed );
 		$ret .= $wgContLang->getDirMark();
 		$ret .= Xml::checkLabel( 'nofollow', 'mwProtect-robots-nofollow', 'mwProtect-robots-nofollow', $nofollowset, $robotsallowed );