X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fskins%2FSkinFallbackTemplate.php;h=1c5f3a6fc498f62b606269a7d241f9c2649d4e1d;hb=a373befd6c2bdff6347de45d793f99f69b1d910a;hp=ea94fad6e209e30e207ea305d28f4d803839e388;hpb=f0f675be341d9797c214632167f54935fdc77d1b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/skins/SkinFallbackTemplate.php b/includes/skins/SkinFallbackTemplate.php index ea94fad6e2..1c5f3a6fc4 100644 --- a/includes/skins/SkinFallbackTemplate.php +++ b/includes/skins/SkinFallbackTemplate.php @@ -17,16 +17,18 @@ class SkinFallbackTemplate extends BaseTemplate { * @return array */ private function findInstalledSkins() { - $styleDirectory = $this->config->get( 'StyleDirectory' ); // @todo we should inject this directly? + $styleDirectory = $this->config->get( 'StyleDirectory' ); // Get all subdirectories which might contains skins $possibleSkins = scandir( $styleDirectory ); $possibleSkins = array_filter( $possibleSkins, function ( $maybeDir ) use ( $styleDirectory ) { return $maybeDir !== '.' && $maybeDir !== '..' && is_dir( "$styleDirectory/$maybeDir" ); } ); - // Only keep the ones that contain a .php file with the same name inside + // Filter out skins that aren't installed $possibleSkins = array_filter( $possibleSkins, function ( $skinDir ) use ( $styleDirectory ) { - return is_file( "$styleDirectory/$skinDir/$skinDir.php" ); + return + is_file( "$styleDirectory/$skinDir/skin.json" ) + || is_file( "$styleDirectory/$skinDir/$skinDir.php" ); } ); return $possibleSkins; @@ -56,7 +58,7 @@ class SkinFallbackTemplate extends BaseTemplate { } else { $skinsInstalledText[] = $this->getMsg( 'default-skin-not-found-row-disabled' ) ->params( $normalizedKey, $skin )->plain(); - $skinsInstalledSnippet[] = "require_once \"\$IP/skins/$skin/$skin.php\";"; + $skinsInstalledSnippet[] = $this->getSnippetForSkin( $skin ); } } @@ -72,6 +74,21 @@ class SkinFallbackTemplate extends BaseTemplate { } } + /** + * Get the appropriate LocalSettings.php snippet to enable the given skin + * + * @param string $skin + * @return string + */ + private function getSnippetForSkin( $skin ) { + global $IP; + if ( file_exists( "$IP/skins/$skin/skin.json" ) ) { + return "wfLoadSkin( '$skin' );"; + } else { + return "require_once \"\$IP/skins/$skin/$skin.php\";"; + } + } + /** * Outputs the entire contents of the page. No navigation (other than search box), just the big * warning message and page content. @@ -91,7 +108,7 @@ class SkinFallbackTemplate extends BaseTemplate {