Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/213005
Change subject: Revert "Use __DIR__"
......................................................................
Revert "Use __DIR__"
This reverts commit 2f3e89c71668262c57fabedf97a0447445d92446.
Change-Id: I6d38b20674c704bbc720c570254ac428edd3069c
---
M LiquidThreads.php
1 file changed, 43 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads
refs/changes/05/213005/1
diff --git a/LiquidThreads.php b/LiquidThreads.php
index 190a531..d61abd6 100644
--- a/LiquidThreads.php
+++ b/LiquidThreads.php
@@ -22,11 +22,12 @@
define( 'LQT_OLDEST_THREADS', 'ot' );
// Localisation
+$dir = __DIR__;
$wgMessagesDirs['LiquidThreads'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['LiquidThreads'] = __DIR__ . '/i18n/Lqt.i18n.php';
-$wgExtensionMessagesFiles['LiquidThreadsMagic'] = __DIR__ .
'/i18n/LiquidThreads.magic.php';
-$wgExtensionMessagesFiles['LiquidThreadsNamespaces'] = __DIR__ .
'/i18n/Lqt.namespaces.php';
-$wgExtensionMessagesFiles['LiquidThreadsAlias'] = __DIR__ .
'/i18n/Lqt.alias.php';
+$wgExtensionMessagesFiles['LiquidThreads'] = $dir . '/i18n/Lqt.i18n.php';
+$wgExtensionMessagesFiles['LiquidThreadsMagic'] = $dir .
'/i18n/LiquidThreads.magic.php';
+$wgExtensionMessagesFiles['LiquidThreadsNamespaces'] = $dir .
'/i18n/Lqt.namespaces.php';
+$wgExtensionMessagesFiles['LiquidThreadsAlias'] = $dir . '/i18n/Lqt.alias.php';
$lqtMessages = array(
'lqt-ajax-updated',
@@ -64,7 +65,7 @@
// ResourceLoader
$lqtResourceTemplate = array(
- 'localBasePath' => __DIR__,
+ 'localBasePath' => $dir,
'remoteExtPath' => 'LiquidThreads'
);
@@ -196,46 +197,46 @@
$wgHooks['userCan'][] = 'LqtHooks::onGetUserPermissionsErrors';
// Classes
-$wgAutoloadClasses['LqtDispatch'] = __DIR__ . '/classes/Dispatch.php';
-$wgAutoloadClasses['LqtView'] = __DIR__ . '/classes/View.php';
-$wgAutoloadClasses['HistoricalThread'] = __DIR__ .
'/classes/HistoricalThread.php';
-$wgAutoloadClasses['Thread'] = __DIR__ . '/classes/Thread.php';
-$wgAutoloadClasses['Threads'] = __DIR__ . '/classes/Threads.php';
-$wgAutoloadClasses['NewMessages'] = __DIR__ .
'/classes/NewMessagesController.php';
-$wgAutoloadClasses['EchoLiquidThreadsFormatter'] = __DIR__.
"/classes/EchoLiquidThreadsFormatter.php";
-$wgAutoloadClasses['LqtParserFunctions'] = __DIR__ .
'/classes/ParserFunctions.php';
-$wgAutoloadClasses['LqtDeletionController'] = __DIR__ .
'/classes/DeletionController.php';
-$wgAutoloadClasses['LqtHooks'] = __DIR__ . '/classes/Hooks.php';
-$wgAutoloadClasses['ThreadRevision'] = __DIR__ . '/classes/ThreadRevision.php';
-$wgAutoloadClasses['SynchroniseThreadArticleDataJob'] = __DIR__ .
'/classes/SynchroniseThreadArticleDataJob.php';
-$wgAutoloadClasses['ThreadHistoryPager'] = __DIR__ .
'/classes/ThreadHistoryPager.php';
-$wgAutoloadClasses['TalkpageHistoryView'] = __DIR__ .
'/pages/TalkpageHistoryView.php';
-$wgAutoloadClasses['LqtLogFormatter'] = __DIR__ . '/classes/LogFormatter.php';
+$wgAutoloadClasses['LqtDispatch'] = $dir . '/classes/Dispatch.php';
+$wgAutoloadClasses['LqtView'] = $dir . '/classes/View.php';
+$wgAutoloadClasses['HistoricalThread'] = $dir .
'/classes/HistoricalThread.php';
+$wgAutoloadClasses['Thread'] = $dir . '/classes/Thread.php';
+$wgAutoloadClasses['Threads'] = $dir . '/classes/Threads.php';
+$wgAutoloadClasses['NewMessages'] = $dir .
'/classes/NewMessagesController.php';
+$wgAutoloadClasses['EchoLiquidThreadsFormatter'] =
"$dir/classes/EchoLiquidThreadsFormatter.php";
+$wgAutoloadClasses['LqtParserFunctions'] = $dir .
'/classes/ParserFunctions.php';
+$wgAutoloadClasses['LqtDeletionController'] = $dir .
'/classes/DeletionController.php';
+$wgAutoloadClasses['LqtHooks'] = $dir . '/classes/Hooks.php';
+$wgAutoloadClasses['ThreadRevision'] = $dir . '/classes/ThreadRevision.php';
+$wgAutoloadClasses['SynchroniseThreadArticleDataJob'] = $dir .
'/classes/SynchroniseThreadArticleDataJob.php';
+$wgAutoloadClasses['ThreadHistoryPager'] = $dir .
'/classes/ThreadHistoryPager.php';
+$wgAutoloadClasses['TalkpageHistoryView'] = $dir .
'/pages/TalkpageHistoryView.php';
+$wgAutoloadClasses['LqtLogFormatter'] = $dir . '/classes/LogFormatter.php';
// View classes
-$wgAutoloadClasses['TalkpageView'] = __DIR__ . '/pages/TalkpageView.php';
-$wgAutoloadClasses['ThreadPermalinkView'] = __DIR__ .
'/pages/ThreadPermalinkView.php';
-$wgAutoloadClasses['TalkpageHeaderView'] = __DIR__ .
'/pages/TalkpageHeaderView.php';
-$wgAutoloadClasses['IndividualThreadHistoryView'] = __DIR__ .
'/pages/IndividualThreadHistoryView.php';
-$wgAutoloadClasses['ThreadDiffView'] = __DIR__ . '/pages/ThreadDiffView.php';
-$wgAutoloadClasses['ThreadWatchView'] = __DIR__ . '/pages/ThreadWatchView.php';
-$wgAutoloadClasses['ThreadProtectionFormView'] = __DIR__ .
'/pages/ThreadProtectionFormView.php';
-$wgAutoloadClasses['ThreadHistoryListingView'] = __DIR__ .
'/pages/ThreadHistoryListingView.php';
-$wgAutoloadClasses['ThreadHistoricalRevisionView'] = __DIR__ .
'/pages/ThreadHistoricalRevisionView.php';
-$wgAutoloadClasses['SummaryPageView'] = __DIR__ . '/pages/SummaryPageView.php';
-$wgAutoloadClasses['NewUserMessagesView'] = __DIR__ .
'/pages/NewUserMessagesView.php';
+$wgAutoloadClasses['TalkpageView'] = $dir . '/pages/TalkpageView.php';
+$wgAutoloadClasses['ThreadPermalinkView'] = $dir .
'/pages/ThreadPermalinkView.php';
+$wgAutoloadClasses['TalkpageHeaderView'] = $dir .
'/pages/TalkpageHeaderView.php';
+$wgAutoloadClasses['IndividualThreadHistoryView'] = $dir .
'/pages/IndividualThreadHistoryView.php';
+$wgAutoloadClasses['ThreadDiffView'] = $dir . '/pages/ThreadDiffView.php';
+$wgAutoloadClasses['ThreadWatchView'] = $dir . '/pages/ThreadWatchView.php';
+$wgAutoloadClasses['ThreadProtectionFormView'] = $dir .
'/pages/ThreadProtectionFormView.php';
+$wgAutoloadClasses['ThreadHistoryListingView'] = $dir .
'/pages/ThreadHistoryListingView.php';
+$wgAutoloadClasses['ThreadHistoricalRevisionView'] = $dir .
'/pages/ThreadHistoricalRevisionView.php';
+$wgAutoloadClasses['SummaryPageView'] = $dir . '/pages/SummaryPageView.php';
+$wgAutoloadClasses['NewUserMessagesView'] = $dir .
'/pages/NewUserMessagesView.php';
// Pagers
-$wgAutoloadClasses['LqtDiscussionPager'] = __DIR__ . '/pages/TalkpageView.php';
-$wgAutoloadClasses['LqtNewMessagesPager'] = __DIR__ .
'/pages/NewUserMessagesView.php';
-$wgAutoloadClasses['TalkpageHistoryPager'] = __DIR__ .
'/pages/TalkpageHistoryView.php';
+$wgAutoloadClasses['LqtDiscussionPager'] = $dir . '/pages/TalkpageView.php';
+$wgAutoloadClasses['LqtNewMessagesPager'] = $dir .
'/pages/NewUserMessagesView.php';
+$wgAutoloadClasses['TalkpageHistoryPager'] = $dir .
'/pages/TalkpageHistoryView.php';
// Special pages
-$wgAutoloadClasses['ThreadActionPage'] = __DIR__ .
'/pages/ThreadActionPage.php';
-$wgAutoloadClasses['SpecialMoveThread'] = __DIR__ .
'/pages/SpecialMoveThread.php';
-$wgAutoloadClasses['SpecialNewMessages'] = __DIR__ .
'/pages/SpecialNewMessages.php';
-$wgAutoloadClasses['SpecialSplitThread'] = __DIR__ .
'/pages/SpecialSplitThread.php';
-$wgAutoloadClasses['SpecialMergeThread'] = __DIR__ .
'/pages/SpecialMergeThread.php';
+$wgAutoloadClasses['ThreadActionPage'] = $dir . '/pages/ThreadActionPage.php';
+$wgAutoloadClasses['SpecialMoveThread'] = $dir .
'/pages/SpecialMoveThread.php';
+$wgAutoloadClasses['SpecialNewMessages'] = $dir .
'/pages/SpecialNewMessages.php';
+$wgAutoloadClasses['SpecialSplitThread'] = $dir .
'/pages/SpecialSplitThread.php';
+$wgAutoloadClasses['SpecialMergeThread'] = $dir .
'/pages/SpecialMergeThread.php';
// Job queue
$wgJobClasses['synchroniseThreadArticleData'] =
'SynchroniseThreadArticleDataJob';
@@ -256,11 +257,11 @@
$wgDefaultUserOptions['lqtcustomsignatures'] = true;
// API
-$wgAutoloadClasses['ApiQueryLQTThreads'] = __DIR__ .
'/api/ApiQueryLQTThreads.php';
+$wgAutoloadClasses['ApiQueryLQTThreads'] = $dir .
'/api/ApiQueryLQTThreads.php';
$wgAPIListModules['threads'] = 'ApiQueryLQTThreads';
-$wgAutoloadClasses['ApiFeedLQTThreads'] = __DIR__ .
'/api/ApiFeedLQTThreads.php';
+$wgAutoloadClasses['ApiFeedLQTThreads'] = $dir . '/api/ApiFeedLQTThreads.php';
$wgAPIModules['feedthreads'] = 'ApiFeedLQTThreads';
-$wgAutoloadClasses['ApiThreadAction'] = __DIR__ . '/api/ApiThreadAction.php';
+$wgAutoloadClasses['ApiThreadAction'] = $dir . '/api/ApiThreadAction.php';
$wgAPIModules['threadaction'] = 'ApiThreadAction';
// Whether or not to use the standard LiquidThreads notifications
--
To view, visit https://gerrit.wikimedia.org/r/213005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d38b20674c704bbc720c570254ac428edd3069c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits