jenkins-bot has submitted this change and it was merged.
Change subject: Kill $dir for good
......................................................................
Kill $dir for good
Change-Id: I139ffd8a64716c707b03934b5c87ccf432d759da
---
M WikiForum.php
1 file changed, 12 insertions(+), 13 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikiForum.php b/WikiForum.php
index ae15b44..16e737f 100644
--- a/WikiForum.php
+++ b/WikiForum.php
@@ -41,18 +41,17 @@
);
// Set up i18n, the new special page etc.
-$dir = dirname( __FILE__ ) . '/';
$wgMessagesDirs['WikiForum'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['WikiForum'] = $dir . 'WikiForum.i18n.php';
-$wgExtensionMessagesFiles['WikiForumAlias'] = $dir . 'WikiForum.alias.php';
-$wgAutoloadClasses['WikiForumHooks'] = $dir . 'WikiForumHooks.php';
-$wgAutoloadClasses['WikiForumGui'] = $dir . 'WikiForumGui.php';
-$wgAutoloadClasses['WikiForumClass'] = $dir . 'WikiForumClass.php';
-$wgAutoloadClasses['WikiForum'] = $dir . 'SpecialWikiForum.php';
-$wgAutoloadClasses['WFReply'] = $dir . 'Reply.php';
-$wgAutoloadClasses['WFThread'] = $dir . 'Thread.php';
-$wgAutoloadClasses['WFForum'] = $dir . 'Forum.php';
-$wgAutoloadClasses['WFCategory'] = $dir . 'Category.php';
+$wgExtensionMessagesFiles['WikiForum'] = __DIR__ . '/WikiForum.i18n.php';
+$wgExtensionMessagesFiles['WikiForumAlias'] = __DIR__ . '/WikiForum.alias.php';
+$wgAutoloadClasses['WikiForumHooks'] = __DIR__ . '/WikiForumHooks.php';
+$wgAutoloadClasses['WikiForumGui'] = __DIR__ . '/WikiForumGui.php';
+$wgAutoloadClasses['WikiForumClass'] = __DIR__ . '/WikiForumClass.php';
+$wgAutoloadClasses['WikiForum'] = __DIR__ . '/SpecialWikiForum.php';
+$wgAutoloadClasses['WFReply'] = __DIR__ . '/Reply.php';
+$wgAutoloadClasses['WFThread'] = __DIR__ . '/Thread.php';
+$wgAutoloadClasses['WFForum'] = __DIR__ . '/Forum.php';
+$wgAutoloadClasses['WFCategory'] = __DIR__ . '/Category.php';
$wgSpecialPages['WikiForum'] = 'WikiForum';
// New user rights for administrating and moderating the forum
@@ -92,7 +91,7 @@
// ResourceLoader support for MediaWiki 1.17+
$wgResourceModules['ext.wikiForum'] = array(
'styles' => 'styles.css',
- 'localBasePath' => dirname( __FILE__ ),
+ 'localBasePath' => __DIR__,
'remoteExtPath' => 'WikiForum',
);
@@ -101,7 +100,7 @@
$wgHooks['LoadExtensionSchemaUpdates'][] = 'WikiForumHooks::addTables';
// Logging
-$wgAutoloadClasses['WikiForumLogFormatter'] = $dir .
'WikiForumLogFormatter.php';
+$wgAutoloadClasses['WikiForumLogFormatter'] = __DIR__ .
'/WikiForumLogFormatter.php';
$wgLogTypes[] = 'forum';
$wgLogActionsHandlers['forum/*'] = 'WikiForumLogFormatter';
--
To view, visit https://gerrit.wikimedia.org/r/223779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I139ffd8a64716c707b03934b5c87ccf432d759da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
