| Index: trunk/phase3/includes/ProtectionForm.php |
| — | — | @@ -74,11 +74,11 @@ |
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | | - // Read checkboxex only if user is allowed to change robots policy, otherwise keep previous policy |
| | 78 | + // Read checkboxes only if user is allowed to change robots policy, otherwise keep previous policy |
| 79 | 79 | if ( $wgUser->isAllowed( 'editrobots' ) ) { |
| 80 | 80 | $robotspolicy = $wgRequest->getBool( 'mwProtect-robots-noindex' ) ? 'noindex' : 'index'; |
| 81 | 81 | $robotspolicy .= $wgRequest->getBool( 'mwProtect-robots-nofollow' ) ? ',nofollow' : ',follow'; |
| 82 | | - // 'index,follow' is default, no need to set this explicitly at this point; is done at Article::View |
| | 82 | + // 'index,follow' is default, no need to set this explicitly at this point; is done at Article::view() |
| 83 | 83 | $this->mRestrictions['robots'] = ( $robotspolicy == 'index,follow' ) ? '' : $robotspolicy; |
| 84 | 84 | } |
| 85 | 85 | } |
| — | — | @@ -336,8 +336,8 @@ |
| 337 | 337 | $noindexset = ( isset( $this->mRestrictions['robots'] ) && strstr( $this->mRestrictions['robots'], 'noindex' ) ) ? true : false; |
| 338 | 338 | $nofollowset = ( isset( $this->mRestrictions['robots'] ) && strstr( $this->mRestrictions['robots'], 'nofollow' ) ) ? true : false; |
| 339 | 339 | $ret = "<tr><td align=\"right\">"; |
| 340 | | - $ret .= Xml::label( wfMsg( 'protect-robotspolicy' ), 'mwProtect-robots-label' ); |
| 341 | | - $ret .= "</td> <td align=\"left\" width=\"60\">"; |
| | 340 | + $ret .= '<label>' . wfMsgExt( 'protect-robotspolicy', array( 'parseinline' ) ) . '</label>'; |
| | 341 | + $ret .= "</td><td align=\"left\" width=\"60\">"; |
| 342 | 342 | $ret .= Xml::checkLabel( 'noindex', 'mwProtect-robots-noindex', 'mwProtect-robots-noindex', $noindexset, $robotsallowed ); |
| 343 | 343 | $ret .= $wgContLang->getDirMark(); |
| 344 | 344 | $ret .= Xml::checkLabel( 'nofollow', 'mwProtect-robots-nofollow', 'mwProtect-robots-nofollow', $nofollowset, $robotsallowed ); |