X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FSetup.php;h=e87b200f5449b518924289e08bcc0aee2e25c6de;hb=9a4bef5f14562fc3c5e72d7177a51eae914f53e0;hp=7f4d6342e9f379f368bb19116c0b8c567bb7dad2;hpb=5572b8644ff033c1f4042bca77da2f0ef3d88a4d;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Setup.php b/includes/Setup.php index 7f4d6342e9..e87b200f54 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -70,7 +70,7 @@ if ( !empty( $wgActionPaths ) && !isset( $wgActionPaths['view'] ) ) { if ( $wgStylePath === false ) $wgStylePath = "$wgScriptPath/skins"; if ( $wgLocalStylePath === false ) $wgLocalStylePath = "$wgScriptPath/skins"; -if ( $wgStyleDirectory === false ) $wgStyleDirectory = "$IP/skins"; +if ( $wgStyleDirectory === false ) $wgStyleDirectory = "$IP/skins"; if ( $wgExtensionAssetsPath === false ) $wgExtensionAssetsPath = "$wgScriptPath/extensions"; if ( $wgLogo === false ) $wgLogo = "$wgStylePath/common/images/wiki.png"; @@ -337,7 +337,7 @@ if ( !$wgHtml5Version && $wgHtml5 && $wgAllowRdfaAttributes ) { } # Blacklisted file extensions shouldn't appear on the "allowed" list -$wgFileExtensions = array_diff ( $wgFileExtensions, $wgFileBlacklist ); +$wgFileExtensions = array_values( array_diff ( $wgFileExtensions, $wgFileBlacklist ) ); if ( $wgArticleCountMethod === null ) { $wgArticleCountMethod = $wgUseCommaCount ? 'comma' : 'link';