*Skip autoloading of skin, always does inefficient strtolower() stuff and fails ...

*Add wfDebug() call on class load failure

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 90e9a53..2e6e81a 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -554,6 +554,7 @@ class AutoLoader {
                                }
                        }
                        if ( !$filename ) {
+                               wfDebug( "Class {$className} not found; skipped loading" );
                                # Give up
                                wfProfileOut( __METHOD__ );
                                return false;

diff --git a/includes/Skin.php b/includes/Skin.php
index b6c623d..a17261b 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -132,7 +132,7 @@ class Skin extends Linker {
                $className = 'Skin'.ucfirst($key);
 
                # Grab the skin class and initialise it.
-               if ( !class_exists( $className ) ) {
+               if ( !class_exists( $className, false ) ) {
                        // Preload base classes to work around APC/PHP5 bug
                        $deps = "{$wgStyleDirectory}/{$skinName}.deps.php";
                        if( file_exists( $deps ) ) include_once( $deps );