rm debug echo (oops)

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

diff --git a/includes/Setup.php b/includes/Setup.php
index c736207..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" );
 }
@@ -308,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;