Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188688
Change subject: Load extensions and skins using extension registration if
possible
......................................................................
Load extensions and skins using extension registration if possible
If the extension or skin has a extension.json/skin.json file, and
the 'ExtensionRegistry' class exists, those extensions will be loaded
through the extension registration system rather than the PHP entry point.
The requirement for SkinFactory to be present when loading skins was removed
since Vector no longer depends upon it.
Bug: T86990
Change-Id: I8175d159017c41db6e52bfff63c66c3fe70e2448
---
M puppet/modules/mediawiki/manifests/extension.pp
A puppet/modules/mediawiki/templates/extension.php.erb
M puppet/modules/mediawiki/templates/skin.php.erb
3 files changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/88/188688/1
diff --git a/puppet/modules/mediawiki/manifests/extension.pp
b/puppet/modules/mediawiki/manifests/extension.pp
index 476ef10..888130b 100644
--- a/puppet/modules/mediawiki/manifests/extension.pp
+++ b/puppet/modules/mediawiki/manifests/extension.pp
@@ -167,7 +167,7 @@
mediawiki::settings { $title:
ensure => $ensure,
wiki => $ext_wiki,
- header => sprintf('include_once "$IP/extensions/%s/%s";',
$ext_name, $ext_entrypoint),
+ header => template('mediawiki/extension.php.erb'),
values => $settings,
priority => $priority,
require => Git::Clone[$ext_repo],
diff --git a/puppet/modules/mediawiki/templates/extension.php.erb
b/puppet/modules/mediawiki/templates/extension.php.erb
new file mode 100644
index 0000000..96c0d09
--- /dev/null
+++ b/puppet/modules/mediawiki/templates/extension.php.erb
@@ -0,0 +1,6 @@
+if ( class_exists( 'ExtensionRegistry' ) && file_exists( "$IP/extensions/<%=
@ext_name %>/extension.json" ) ) {
+ ExtensionRegistry::getInstance()->queue( "$IP/extensions/<%= @ext_name
%>/extension.json" );
+} else {
+ include_once "$IP/extensions/<%= @ext_name %>/<%= @ext_entrypoint %>";
+}
+
diff --git a/puppet/modules/mediawiki/templates/skin.php.erb
b/puppet/modules/mediawiki/templates/skin.php.erb
index 39536e2..dd2d007 100644
--- a/puppet/modules/mediawiki/templates/skin.php.erb
+++ b/puppet/modules/mediawiki/templates/skin.php.erb
@@ -1,7 +1,9 @@
-if ( class_exists( 'SkinFactory' ) ) {
- // MediaWiki Vagrant only supports loading skins using SkinFactory
+if ( class_exists( 'ExtensionRegistry' ) && file_exists( "$IP/skins/<%= @skin
%>/skin.json" ) ) {
+ ExtensionRegistry::getInstance()->queue( "$IP/skins/<%= @skin
%>/skin.json" );
+} else {
include_once "$IP/skins/<%= @skin %>/<%= @skin %>.php";
-<% if @default -%>
- $wgDefaultSkin = '<%= @skin.downcase %>';
-<% end -%>
}
+<% if @default -%>
+$wgDefaultSkin = '<%= @skin.downcase %>';
+<% end -%>
+
--
To view, visit https://gerrit.wikimedia.org/r/188688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8175d159017c41db6e52bfff63c66c3fe70e2448
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
