rm debug echo (oops)

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 20b4799..67c52c4 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -8,7 +8,6 @@
  * MEDIAWIKI is defined
  */
 if( !defined( 'MEDIAWIKI' ) ) {
-       echo "This file is part of MediaWiki, it is not a valid entry point.\n";
        exit( 1 );
 }
 
@@ -87,7 +86,6 @@ if ( !$wgLocalFileRepo ) {
                'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
                'thumbScriptUrl' => $wgThumbnailScriptPath,
                'transformVia404' => !$wgGenerateThumbnailOnParse,
-               'initialCapital' => $wgCapitalLinks,
                'deletedDir' => $wgFileStore['deleted']['directory'],
                'deletedHashLevels' => $wgFileStore['deleted']['hash']
        );
@@ -130,6 +128,18 @@ if ( $wgUseSharedUploads ) {
                );
        }
 }
+if( $wgUseInstantCommons ) {
+       $wgForeignFileRepos[] = array(
+          'class'                   => 'ForeignAPIRepo',
+          'name'                    => 'wikimediacommons',
+          'apibase'                 => 'http://commons.wikimedia.org/w/api.php',
+          'fetchDescription'        => true,
+          'descriptionCacheExpiry'  => 43200,
+          'apiThumbCacheExpiry'     => 86400,
+       );
+}
+
+
 if ( !class_exists( 'AutoLoader' ) ) {
        require_once( "$IP/includes/AutoLoader.php" );
 }
@@ -149,7 +159,8 @@ require_once( "$IP/includes/ImageFunctions.php" );
 require_once( "$IP/includes/StubObject.php" );
 wfProfileOut( $fname.'-includes' );
 wfProfileIn( $fname.'-misc1' );
-
+# Raise the memory limit if it's too low
+wfMemoryLimit();
 
 $wgIP = false; # Load on demand
 # Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
@@ -167,7 +178,15 @@ if ( $wgCommandLineMode ) {
        }
        wfDebug( "\n" );
 } elseif( isset( $_SERVER['REQUEST_URI'] ) ) {
+       wfDebug( "\n\nStart request\n" );
        wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
+       foreach ( $_SERVER as $name => $value ) {
+               if ( substr( $name, 0, 5 ) == 'HTTP_' ) {
+                       $name = substr( $name, 5 );
+                       wfDebug( "$name: $value\n" );
+               }
+       }
+       wfDebug( "\n" );
 }
 
 if( $wgRCFilterByAge ) {
@@ -269,7 +288,6 @@ $wgRequest->interpolateTitle();
 
 $wgUser = new StubUser;
 $wgLang = new StubUserLang;
-$wgVariant = new StubUserVariant;
 $wgOut = new StubObject( 'wgOut', 'OutputPage' );
 $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
 
@@ -300,9 +318,9 @@ $wgDeferredUpdateList = array();
 $wgPostCommitUpdateList = array();
 
 if ( $wgAjaxWatch ) $wgAjaxExportList[] = 'wfAjaxWatch';
-if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'UploadForm::ajaxGetExistsWarning';
+if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'SpecialUpload::ajaxGetExistsWarning';
 if( $wgAjaxLicensePreview )
-       $wgAjaxExportList[] = 'UploadForm::ajaxGetLicensePreview';
+       $wgAjaxExportList[] = 'SpecialUpload::ajaxGetLicensePreview';
 
 # Placeholders in case of DB error
 $wgTitle = null;
@@ -311,15 +329,16 @@ $wgArticle = null;
 wfProfileOut( $fname.'-misc2' );
 wfProfileIn( $fname.'-extensions' );
 
-/*
- * load the $wgExtensionMessagesFiles for the script loader
- * this can't be done in a normal extension type way
- * since the script-loader is an entry point
- */
-if( $wgEnableScriptLoader && strpos( wfGetScriptUrl(), "mwScriptLoader.php" ) !== false ){
-       $wgExtensionMessagesFiles['mwEmbed'] = "{$IP}/js2/mwEmbed/php/languages/mwEmbed.i18n.php";
-}
+# load the $wgExtensionMessagesFiles for the script loader
+# this can't be done in a normal extension type way
+# since the script-loader is an entry point
+#
+$wgExtensionMessagesFiles['mwEmbed'] = "{$IP}/js2/mwEmbed/php/languages/mwEmbed.i18n.php";
 
+# Include the js2/mwEmbed autoLoadClasses if js2 is enabled
+if( $wgEnableJS2system ){
+       require_once("$IP/js2/mwEmbed/php/jsAutoloadLocalClasses.php");
+}
 
 # Extension setup functions for extensions other than skins
 # Entries should be added to this variable during the inclusion
@@ -327,12 +346,16 @@ if( $wgEnableScriptLoader && strpos( wfGetScriptUrl(), "mwScriptLoader.php" ) !=
 # any necessary initialisation in the fully initialised environment
 foreach ( $wgExtensionFunctions as $func ) {
        # Allow closures in PHP 5.3+
-       if ( is_object( $func ) && $func instanceof Closure )
+       if ( is_object( $func ) && $func instanceof Closure ) {
                $profName = $fname.'-extensions-closure';
-       elseif( is_array( $func ) )
-               $profName = $fname.'-extensions-'.implode( '::', $func );
-       else
+       } elseif( is_array( $func ) ) {
+               if ( is_object( $func[0] ) )
+                       $profName = $fname.'-extensions-'.get_class( $func[0] ).'::'.$func[1];
+               else
+                       $profName = $fname.'-extensions-'.implode( '::', $func );
+       } else {
                $profName = $fname.'-extensions-'.strval( $func );
+       }
 
        wfProfileIn( $profName );
        call_user_func( $func );