Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256946
Change subject: Breaking change: no longer autoload with composer
......................................................................
Breaking change: no longer autoload with composer
Change-Id: Iafad7f6899701aaaecb180e52e824d9fa3ae733f
---
M MixedNamespaceSearchSuggestions.php
M README.md
M Resources.php
M composer.json
4 files changed, 5 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MixedNamespaceSearchSuggestions
refs/changes/46/256946/1
diff --git a/MixedNamespaceSearchSuggestions.php
b/MixedNamespaceSearchSuggestions.php
index 0796815..8b97a49 100644
--- a/MixedNamespaceSearchSuggestions.php
+++ b/MixedNamespaceSearchSuggestions.php
@@ -8,10 +8,10 @@
die();
}
-$GLOBALS['wgExtensionCredits']['other'][] = array(
+$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'MixedNamespaceSearchSuggestions',
- 'version' => '2014-06-24',
+ 'version' => '2015-12-04',
'author' => 'Niklas Laxström',
'descriptionmsg' => 'mnss-desc',
'url' =>
'https://www.mediawiki.org/wiki/Extension:MixedNamespaceSearchSuggestions',
@@ -21,8 +21,8 @@
$dir = __DIR__;
require_once "$dir/Resources.php";
-$GLOBALS['wgMessagesDirs']['MNSS'] = "$dir/i18n";
+$wgMessagesDirs['MNSS'] = "$dir/i18n";
-$GLOBALS['wgHooks']['BeforePageDisplay'][] = function ( OutputPage $out ) {
+$wgHooks['BeforePageDisplay'][] = function ( OutputPage $out ) {
$out->addModules( 'ext.mnss.search' );
};
diff --git a/README.md b/README.md
index 2ba1da3..b914822 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
This is a MediaWiki extension which changes the search box behavior to include
suggestions from all
content namespaces, showing from which namespace each suggestion is from.
-Requires MediaWiki 1.24alpha or newer.
+Requires MediaWiki 1.24 or newer.
For more details see the
[extension
page](https://www.mediawiki.org/wiki/Extension:MixedNamespaceSearchSuggestions)
at
diff --git a/Resources.php b/Resources.php
index 4bfbf55..3c13b37 100644
--- a/Resources.php
+++ b/Resources.php
@@ -4,8 +4,6 @@
* @license MIT
*/
-global $wgResourceModules;
-
$resourcePaths = array(
'localBasePath' => __DIR__,
'remoteExtPath' => 'MixedNamespaceSearchSuggestions'
diff --git a/composer.json b/composer.json
index af90eb6..bb4ce84 100644
--- a/composer.json
+++ b/composer.json
@@ -14,8 +14,5 @@
"require": {
"php": ">=5.3.0",
"composer/installers": "~1.0"
- },
- "autoload": {
- "files": ["MixedNamespaceSearchSuggestions.php"]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/256946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafad7f6899701aaaecb180e52e824d9fa3ae733f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MixedNamespaceSearchSuggestions
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
