Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/137905
Change subject: Register CategoryTreeMagic from global scope instead of setup
......................................................................
Register CategoryTreeMagic from global scope instead of setup
Follows-up I32357244c013a2370f14f.
I don't know how or why, but this late way of registering magic
words from within an extension setup function is sometimes
causing people's install to fatally crash on:
> Exception from line 318 of mw/includes/MagicWord.php:
> Error: invalid magic word 'categorytree'
Just move it out of there into a plain and simple registration.
The parser function itself is still registered conditionally.
Change-Id: I07df5de5f39ce0ad029ef0152d126e620308ba25
(cherry picked from commit 8d7de84017d3f8efb6bfb5265665aa4907767cde)
---
M CategoryTree.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTree
refs/changes/05/137905/1
diff --git a/CategoryTree.php b/CategoryTree.php
index 606a74e..1d359a1 100644
--- a/CategoryTree.php
+++ b/CategoryTree.php
@@ -116,6 +116,7 @@
*/
$wgMessagesDirs['CategoryTree'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['CategoryTree'] = __DIR__ . '/CategoryTree.i18n.php';
+$wgExtensionMessagesFiles['CategoryTreeMagic'] = __DIR__ .
'/CategoryTree.i18n.magic.php';
$wgAutoloadClasses['CategoryTreePage'] = __DIR__ . '/CategoryTreePage.php';
$wgAutoloadClasses['CategoryTree'] = __DIR__ . '/CategoryTreeFunctions.php';
$wgAutoloadClasses['CategoryTreeCategoryPage'] = __DIR__ .
'/CategoryPageSubclass.php';
@@ -187,9 +188,7 @@
}
if ( $wgCategoryTreeAllowTag ) {
- global $wgExtensionMessagesFiles;
$wgHooks['ParserFirstCallInit'][] = 'efCategoryTreeSetHooks';
- $wgExtensionMessagesFiles['CategoryTreeMagic'] = __DIR__ .
'/CategoryTree.i18n.magic.php';
}
if ( !isset( $wgCategoryTreeDefaultOptions['mode'] ) || is_null(
$wgCategoryTreeDefaultOptions['mode'] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/137905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07df5de5f39ce0ad029ef0152d126e620308ba25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: REL1_23
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
