diff --git a/Dockerfile b/Dockerfile index d55571da..de23b1ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -656,12 +656,6 @@ RUN set -x; \ cd $MW_HOME/extensions/SemanticScribunto \ && git apply /tmp/semantic-scribunto-autoload.patch -# Add Bootstrap to LocalSettings.php if the web installer added the Chameleon skin -COPY _sources/patches/core-local-settings-generator.patch /tmp/core-local-settings-generator.patch -RUN set -x; \ - cd $MW_HOME \ - && git apply /tmp/core-local-settings-generator.patch - # Cleanup all .git leftovers RUN set -x; \ cd $MW_HOME \ diff --git a/_sources/patches/core-local-settings-generator.patch b/_sources/patches/core-local-settings-generator.patch deleted file mode 100644 index 5c81e273..00000000 --- a/_sources/patches/core-local-settings-generator.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/includes/installer/LocalSettingsGenerator.php -+++ b/includes/installer/LocalSettingsGenerator.php -@@ -51,6 +51,15 @@ - $this->skins = $installer->getVar( '_Skins' ); - $this->IP = $installer->getVar( 'IP' ); - -+ // Patch for Canasta - if the user is enabling the Chameleon -+ // skin (likely, since all skins are selected by default), make -+ // sure the Bootstrap skin is enabled as well, to avoid a -+ // MediaWiki error. -+ if ( in_array( 'chameleon', $this->skins ) && -+ !in_array( 'Bootstrap', $this->extensions ) ) { -+ $this->extensions[] = 'Bootstrap'; -+ } -+ - $db = $installer->getDBInstaller( $installer->getVar( 'wgDBtype' ) ); - - $confItems = array_merge(