| Index: trunk/extensions/Configure/Configure.page.php |
| — | — | @@ -17,7 +17,6 @@ |
| 18 | 18 | * Constructor |
| 19 | 19 | */ |
| 20 | 20 | public function __construct( $name, $right ) { |
| 21 | | - wfLoadExtensionMessages( 'Configure' ); |
| 22 | 21 | $this->mConfSettings = ConfigurationSettings::singleton( $this->getSettingMask() ); |
| 23 | 22 | # Reload data WITHOUT CACHE |
| 24 | 23 | global $wgConf; |
| — | — | @@ -379,22 +378,23 @@ |
| 380 | 379 | foreach ( $versions as $data ) { |
| 381 | 380 | $ts = $data['timestamp']; |
| 382 | 381 | $count++; |
| 383 | | - $link = $skin->makeKnownLinkObj( $title, $wgLang->timeAndDate( $ts ), "version=$ts" ); |
| | 382 | + $link = $skin->linkKnown( $title, $wgLang->timeAndDate( $ts ), array(), array( 'version' => $ts ) ); |
| 384 | 383 | $diffLink = ''; |
| 385 | 384 | if ( $prev ) |
| 386 | | - $diffLink = '(' . $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'ViewConfig' ), wfMsg( 'configure-old-changes' ), "version=$ts&diff=$prev" ) . ')'; |
| | 385 | + $diffLink = '(' . $skin->linkKnown( SpecialPage::getTitleFor( 'ViewConfig' ), |
| | 386 | + wfMsgHtml( 'configure-old-changes' ), array(), array( 'version' => $ts, 'diff' => $prev ) ) . ')'; |
| 387 | 387 | |
| 388 | 388 | ## Make user link... |
| 389 | 389 | $userLink = ''; |
| 390 | 390 | if( !$data['userwiki'] || !$data['username'] ) { |
| 391 | 391 | $userLink = ''; |
| 392 | 392 | } else if ( $data['userwiki'] == wfWikiId() ) { |
| 393 | | - $userLink = $skin->link( Title::makeTitle( NS_USER, $data['username'] ), $data['username'] ); |
| 394 | | - } elseif ( class_exists( 'WikiMap' ) && ($wiki = WikiMap::getWiki( $data['userwiki'] ) ) ) { |
| 395 | | - $userLink = $skin->makeExternalLink( $wiki->getUrl( 'User:'.$data['username'] ), $data['username'].'@'.$data['userwiki'] ); |
| | 393 | + $userLink = $skin->link( Title::makeTitle( NS_USER, $data['username'] ), htmlspecialchars( $data['username'] ) ); |
| | 394 | + } elseif ( $wiki = WikiMap::getWiki( $data['userwiki'] ) ) { |
| | 395 | + $userLink = $skin->makeExternalLink( $wiki->getUrl( 'User:'.$data['username'] ), htmlspecialchars( $data['username'].'@'.$data['userwiki'] ) ); |
| 396 | 396 | } else { |
| 397 | 397 | ## Last-ditch |
| 398 | | - $userLink = $data['username'].'@'.$data['userwiki']; |
| | 398 | + $userLink = htmlspecialchars( $data['username'].'@'.$data['userwiki'] ); |
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | $comment = $data['reason'] ? $skin->commentBlock( $data['reason'] ) : ''; |
| — | — | @@ -875,7 +875,7 @@ |
| 876 | 876 | protected function buildSearchForm() { |
| 877 | 877 | $form = wfMsgExt( 'configure-js-search-prompt', 'parseinline' ) . wfMsgExt( 'word-separator', array( 'escapenoentities' ) ) . |
| 878 | 878 | Xml::element( 'input', array( 'id' => 'configure-search-input', 'size' => 45 ) ); |
| 879 | | - $form = Xml::tags( 'p', null, $form ) . "\n" . Xml::openElement( 'ul', array('id' => 'configure-search-results') ) . '</ul>'; |
| | 879 | + $form = Xml::tags( 'p', null, $form ) . "\n" . Xml::openElement( 'ul', array( 'id' => 'configure-search-results' ) ) . '</ul>'; |
| 880 | 880 | $form = Xml::fieldset( wfMsg( 'configure-js-search-legend' ), $form, array( 'style' => 'display: none;', 'id' => 'configure-search-form' ) ); |
| 881 | 881 | return $form; |
| 882 | 882 | } |
| — | — | @@ -1498,8 +1498,6 @@ |
| 1499 | 1499 | * @return xhtml |
| 1500 | 1500 | */ |
| 1501 | 1501 | protected function buildSettings( $settings, $param = array() ) { |
| 1502 | | - wfLoadExtensionMessages( 'ConfigureSettings' ); |
| 1503 | | - |
| 1504 | 1502 | global $wgConf; |
| 1505 | 1503 | $defaults = $wgConf->getDefaultsForWiki( $this->mWiki ); |
| 1506 | 1504 | |
| Index: trunk/extensions/Configure/Configure.diff.php |
| — | — | @@ -189,8 +189,6 @@ |
| 190 | 190 | * @return String: XHTML |
| 191 | 191 | */ |
| 192 | 192 | function processDiffSetting( $name, $old, $new, $type ) { |
| 193 | | - wfLoadExtensionMessages( 'ConfigureSettings' ); |
| 194 | | - |
| 195 | 193 | $msg = 'configure-setting-' . $name; |
| 196 | 194 | $msgVal = wfMsgExt( $msg, array( 'parseinline' ) ); |
| 197 | 195 | $rawVal = Xml::element( 'tt', null, "\$$name" ); |
| Index: trunk/extensions/Configure/Configure.func.php |
| — | — | @@ -25,7 +25,6 @@ |
| 26 | 26 | if ( $settings->getSettingType( $setting ) != 'array' ) |
| 27 | 27 | return '<err#>'; |
| 28 | 28 | |
| 29 | | - wfLoadExtensionMessages( 'Configure' ); |
| 30 | 29 | $type = $settings->getArrayType( $setting ); |
| 31 | 30 | switch( $type ) { |
| 32 | 31 | case 'group-bool': |
| — | — | @@ -141,7 +140,6 @@ |
| 142 | 141 | function efConfigureFarmerAdminExtensions( $farmer ) { |
| 143 | 142 | global $wgOut; |
| 144 | 143 | |
| 145 | | - wfLoadExtensionMessages( 'Configure' ); |
| 146 | 144 | $wgOut->wrapWikiMsg( '== $1 ==', 'farmer-extensions' ); |
| 147 | 145 | $wgOut->addWikiMsg( 'configure-farmer-extensions' ); |
| 148 | 146 | |
| — | — | @@ -154,7 +152,6 @@ |
| 155 | 153 | function efConfigureFarmerManageExtensions( $farmer ) { |
| 156 | 154 | global $wgOut; |
| 157 | 155 | |
| 158 | | - wfLoadExtensionMessages( 'Configure' ); |
| 159 | 156 | $wgOut->wrapWikiMsg( '== $1 ==', 'farmer-extensions-available' ); |
| 160 | 157 | $wgOut->addWikiMsg( 'configure-farmer-extensions-list' ); |
| 161 | 158 | |