* Reorganised the includes directory, creating subdirectories db, parser and specials

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

diff --git a/includes/Setup.php b/includes/Setup.php
index 2ed4a41..c5d3f1b 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -58,7 +58,6 @@ if ( empty( $wgFileStore['deleted']['directory'] ) ) {
        $wgFileStore['deleted']['directory'] = "{$wgUploadDirectory}/deleted";
 }
 
-
 /**
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
@@ -115,7 +114,9 @@ if ( $wgUseSharedUploads ) {
        }
 }
 
-require_once( "$IP/includes/AutoLoader.php" );
+if ( !class_exists( 'AutoLoader' ) ) {
+       require_once( "$IP/includes/AutoLoader.php" );
+}
 
 wfProfileIn( $fname.'-exception' );
 require_once( "$IP/includes/Exception.php" );