| Index: trunk/extensions/HelpCommons/HelpCommons.php |
| — | — | @@ -27,8 +27,7 @@ |
| 28 | 28 | ); |
| 29 | 29 | |
| 30 | 30 | // Internationalization |
| 31 | | -$dir = dirname( __FILE__ ) . '/'; |
| 32 | | -$wgExtensionMessagesFiles['HelpCommons'] = $dir . 'HelpCommons.i18n.php'; |
| | 31 | +$wgExtensionMessagesFiles['HelpCommons'] = dirname( __FILE__ ) . '/HelpCommons.i18n.php'; |
| 33 | 32 | |
| 34 | 33 | // Help wiki(s) where the help namespace is fetched from |
| 35 | 34 | $wgHelpCommonsFetchingWikis = array(); |
| — | — | @@ -92,7 +91,7 @@ |
| 93 | 92 | |
| 94 | 93 | if ( !empty( $text->old_text ) ) { |
| 95 | 94 | $wgOut->addWikiText( $text->old_text ); |
| 96 | | - $wgOut->addScript('<style type="text/css">div.noarticletext { display: none; } div.mw-warning-with-logexcerpt { display: none; } #contentSub, #contentSub2 { display: none; }</style>'); |
| | 95 | + $wgOut->addScript( '<style type="text/css">div.noarticletext { display: none; } div.mw-warning-with-logexcerpt { display: none; } #contentSub, #contentSub2 { display: none; }</style>' ); |
| 97 | 96 | return false; |
| 98 | 97 | } else { |
| 99 | 98 | return true; |
| — | — | @@ -197,6 +196,15 @@ |
| 198 | 197 | function efHelpCommonsChangeCategoryLinks( $skin, $target, &$text, &$customAttribs, &$query, &$options, &$ret ) { |
| 199 | 198 | global $wgTitle, $wgHelpCommonsFetchingWikis, $wgLanguageCode, $wgDBname; |
| 200 | 199 | |
| | 200 | + // only affects non-help-page-fetching wikis |
| | 201 | + foreach ( $wgHelpCommonsFetchingWikis as $language => $urls ) { |
| | 202 | + foreach ( $urls as $url => $helpwiki ) { |
| | 203 | + if ( $wgDBname == $helpwiki ) { |
| | 204 | + return true; |
| | 205 | + } |
| | 206 | + } |
| | 207 | + } |
| | 208 | + |
| 201 | 209 | if ( $wgTitle->getNamespace() != NS_HELP || $wgTitle->exists() ) { |
| 202 | 210 | return true; |
| 203 | 211 | } |
| — | — | @@ -222,7 +230,7 @@ |
| 223 | 231 | // change category's link |
| 224 | 232 | foreach ( $wgHelpCommonsFetchingWikis as $language => $urls ) { |
| 225 | 233 | foreach ( $urls as $url => $helpwiki ) { |
| 226 | | - if ( $wgLanguageCode == $language && $wgDBname != $helpwiki ) { |
| | 234 | + if ( $wgLanguageCode == $language ) { |
| 227 | 235 | $text = '<a href="' . $url . '/index.php?title=' . str_replace( ' ', '_', $target->getPrefixedText() ) . '">' . $text . '</a>'; |
| 228 | 236 | } |
| 229 | 237 | } |
| Index: trunk/extensions/BatchUserRights/BatchUserRights_body.php |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | * @file |
| 7 | 7 | * @ingroup SpecialPage |
| 8 | 8 | */ |
| 9 | | -class BatchUserRights extends SpecialPage { |
| | 9 | +class SpecialBatchUserRights extends SpecialPage { |
| 10 | 10 | protected $isself = false; |
| 11 | 11 | |
| 12 | 12 | /** |
| Index: trunk/extensions/BatchUserRights/BatchUserRights.php |
| — | — | @@ -35,5 +35,5 @@ |
| 36 | 36 | $dir = dirname( __FILE__ ) . '/'; |
| 37 | 37 | $wgExtensionMessagesFiles['BatchUserRights'] = $dir . 'BatchUserRights.i18n.php'; |
| 38 | 38 | $wgExtensionMessagesFiles['BatchUserRightsAliases'] = $dir . 'BatchUserRights.alias.php'; |
| 39 | | -$wgAutoloadClasses['BatchUserRights'] = $dir . 'BatchUserRights_body.php'; |
| 40 | | -$wgSpecialPages['BatchUserRights'] = 'BatchUserRights'; |
| | 39 | +$wgAutoloadClasses['SpecialBatchUserRights'] = $dir . 'BatchUserRights_body.php'; |
| | 40 | +$wgSpecialPages['BatchUserRights'] = 'SpecialBatchUserRights'; |