Merge "Add ability to pre-render thumbnails at upload time"

[lhc/web/wiklou.git] / mw-config / index.php

diff --git a/mw-config/index.php b/mw-config/index.php
index d22454f..a6cebc3 100644 (file)
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -20,6 +20,13 @@
  * @file
  */
 
+// Bail if PHP is too low
+if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.2' ) < 0 ) {
+       // We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
+       require dirname( dirname( __FILE__ ) ) . '/includes/PHPVersionError.php';
+       wfPHPVersionError( 'mw-config/index.php' );
+}
+
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
 define( 'MEDIAWIKI_INSTALL', true );
 
@@ -37,10 +44,9 @@ function wfInstallerMain() {
 
        if ( !$installer->startSession() ) {
 
-               if( $installer->request->getVal( "css" ) ) {
+               if ( $installer->request->getVal( "css" ) ) {
                        // Do not display errors on css pages
-                       $cssDir = $installer->request->getVal( "css" );
-                       $installer->outputCss( $cssDir );
+                       $installer->outputCss();
                        exit;
                }