Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/124368
Change subject: Fix undefined variable $dir
......................................................................
Fix undefined variable $dir
* Follow-up to 7f440c3f728d29a.
* Use __DIR__ everywhere.
Change-Id: If4ff55920207ba69dc4d981a68598e0a1eb029e4
---
M CategoryTree.php
1 file changed, 8 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTree
refs/changes/68/124368/1
diff --git a/CategoryTree.php b/CategoryTree.php
index cf1a119..606a74e 100644
--- a/CategoryTree.php
+++ b/CategoryTree.php
@@ -97,7 +97,7 @@
$wgCategoryTreePageCategoryOptions['depth'] = 0;
# $wgCategoryTreePageCategoryOptions['class'] = 'CategoryTreeInlineNode';
-$wgExtensionMessagesFiles['CategoryTreeAlias'] = dirname( __FILE__ ) .
'/CategoryTree.alias.php';
+$wgExtensionMessagesFiles['CategoryTreeAlias'] = __DIR__ .
'/CategoryTree.alias.php';
/**
* Register extension setup hook and credits
@@ -114,14 +114,12 @@
/**
* Register the special page
*/
-$dir = dirname( __FILE__ ) . '/';
-
$wgMessagesDirs['CategoryTree'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['CategoryTree'] = $dir . 'CategoryTree.i18n.php';
-$wgAutoloadClasses['CategoryTreePage'] = $dir . 'CategoryTreePage.php';
-$wgAutoloadClasses['CategoryTree'] = $dir . 'CategoryTreeFunctions.php';
-$wgAutoloadClasses['CategoryTreeCategoryPage'] = $dir .
'CategoryPageSubclass.php';
-$wgAutoloadClasses['CategoryTreeCategoryViewer'] = $dir .
'CategoryPageSubclass.php';
+$wgExtensionMessagesFiles['CategoryTree'] = __DIR__ . '/CategoryTree.i18n.php';
+$wgAutoloadClasses['CategoryTreePage'] = __DIR__ . '/CategoryTreePage.php';
+$wgAutoloadClasses['CategoryTree'] = __DIR__ . '/CategoryTreeFunctions.php';
+$wgAutoloadClasses['CategoryTreeCategoryPage'] = __DIR__ .
'/CategoryPageSubclass.php';
+$wgAutoloadClasses['CategoryTreeCategoryViewer'] = __DIR__ .
'/CategoryPageSubclass.php';
$wgSpecialPages['CategoryTree'] = 'CategoryTreePage';
$wgSpecialPageGroups['CategoryTree'] = 'pages';
# $wgHooks['SkinTemplateTabs'][] = 'efCategoryTreeInstallTabs';
@@ -136,7 +134,7 @@
* Register ResourceLoader modules
*/
$commonModuleInfo = array(
- 'localBasePath' => dirname( __FILE__ ) . '/modules',
+ 'localBasePath' => __DIR__ . '/modules',
'remoteExtPath' => 'CategoryTree/modules',
);
@@ -191,7 +189,7 @@
if ( $wgCategoryTreeAllowTag ) {
global $wgExtensionMessagesFiles;
$wgHooks['ParserFirstCallInit'][] = 'efCategoryTreeSetHooks';
- $wgExtensionMessagesFiles['CategoryTreeMagic'] = $dir .
'CategoryTree.i18n.magic.php';
+ $wgExtensionMessagesFiles['CategoryTreeMagic'] = __DIR__ .
'/CategoryTree.i18n.magic.php';
}
if ( !isset( $wgCategoryTreeDefaultOptions['mode'] ) || is_null(
$wgCategoryTreeDefaultOptions['mode'] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/124368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4ff55920207ba69dc4d981a68598e0a1eb029e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
