Add logging when stripping apps from autoload include path

diff --git a/lib/base.php b/lib/base.php
index 50f113543c4a5f5953721f285982685c57014add..6305da169306a6f1cb7bfcac28ce3b4f6e37a9ae 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -72,11 +72,14 @@ class OC{
         */
        public static function autoload($className) {
                if(array_key_exists($className, OC::$CLASSPATH)) {
+                       $path = OC::$CLASSPATH[$className];
                        /** @TODO: Remove this when necessary
                         Remove "apps/" from inclusion path for smooth migration to mutli app dir
                        */
-                       $path = str_replace('apps/', '', OC::$CLASSPATH[$className]);
-                       require_once $path;
+                       if (strpos($path, 'apps/')===0) {
+                               OC_Log::write('core', 'include path for class "'.$className.'" starts with "apps/"', OC_Log::DEBUG);
+                               $path = str_replace('apps/', '', $path);
+                       }
                }
                elseif(strpos($className, 'OC_')===0) {
                        $path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');