Merged ImageFunctions.php into GlobalFunctions.php

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

diff --git a/includes/Setup.php b/includes/Setup.php
index 9333e40..fd35a60 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -49,7 +49,7 @@ if ( !empty($wgActionPaths) && !isset($wgActionPaths['view']) ) {
 
 if ( !empty($wgActionPaths) && !isset($wgActionPaths['view']) ) {
        # 'view' is assumed the default action path everywhere in the code
-       # but is rarely filled in $wgActionPaths 
+       # but is rarely filled in $wgActionPaths
        $wgActionPaths['view'] = $wgArticlePath ;
 }
 
@@ -381,7 +381,6 @@ if ( !defined( 'MW_COMPILED' ) ) {
        require_once( "$IP/includes/normal/UtfNormalUtil.php" );
        require_once( "$IP/includes/GlobalFunctions.php" );
        require_once( "$IP/includes/ProxyTools.php" );
-       require_once( "$IP/includes/ImageFunctions.php" );
        require_once( "$IP/includes/normal/UtfNormalDefines.php" );
        wfProfileOut( $fname . '-includes' );
 }