jenkins-bot has submitted this change and it was merged.
Change subject: Use $wgAutoloadClasses and remove jquery dependency
......................................................................
Use $wgAutoloadClasses and remove jquery dependency
Instead of require_once use $wgAutoloadClasses.
Remove jquery as a dependency from resourceloader because it is always
loaded first and causes the tests to fail.
Change-Id: I5c3b84229aa0112b61632d8a5e56ff9564bdd776
---
M XMLContentExtension.php
M XMLContentExtension.resources.php
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/XMLContentExtension.php b/XMLContentExtension.php
index da37baa..ecfbf72 100644
--- a/XMLContentExtension.php
+++ b/XMLContentExtension.php
@@ -1,5 +1,4 @@
<?php
-
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'XMLContentExtension',
@@ -18,11 +17,13 @@
require_once(__DIR__ . '/XMLContentExtension.body.php');
-require_once(__DIR__ . '/include/XmlContent.class.php');
-require_once(__DIR__ . '/include/XmlContentHandler.class.php');
-require_once(__DIR__ . '/include/XMLDocument.class.php');
+$wgAutoloadClasses['XMLDocument'] = __DIR__ . '/include/XmlContent.class.php';
+$wgAutoloadClasses['XmlContentHandler'] = __DIR__ .
'/include/XmlContentHandler.class.php';
+$wgAutoloadClasses['XMLDocument'] = __DIR__ . '/include/XMLDocument.class.php';
require_once(__DIR__ . '/XMLContentExtension.resources.php');
-require_once(__DIR__ . '/XMLContentExtension.hooks.php');
-require_once(__DIR__ . '/XMLContentExtension.routes.php');
+$wgAutoloadClasses['XMLContentExtensionHooks'] = __DIR__ .
'/XMLContentExtension.hooks.php';
+$wgAutoloadClasses['XMLContentExtensionRoutes'] = __DIR__ .
'/XMLContentExtension.routes.php';
+
+?>
diff --git a/XMLContentExtension.resources.php
b/XMLContentExtension.resources.php
index 01fd340..823bbc5 100644
--- a/XMLContentExtension.resources.php
+++ b/XMLContentExtension.resources.php
@@ -17,7 +17,6 @@
),
'localBasePath' => __DIR__ . '/assets/',
'remoteExtPath' => 'XMLContentExtension/assets',
- 'dependencies' => array('jquery'),
);
$wgResourceModules['ace'] = array(
--
To view, visit https://gerrit.wikimedia.org/r/271147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c3b84229aa0112b61632d8a5e56ff9564bdd776
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/XMLContentExtension
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Jnanninga <nanni...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
