Fixed tableName issue

[core.git] / inc / loader / class_ClassLoader.php

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 31fc9de2ee2f52b45658c768a124c987dc842016..7b6bb2dd1a32b6d38607249a97cab86861a6d955 100644 (file)
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -104,7 +104,7 @@ class ClassLoader {
        private static $frameworkPaths = array(
                'exceptions', // Exceptions
                'interfaces', // Interfaces
-               'main',       // General main classes
+               'classes',    // Classes
                'middleware'  // The middleware
        );
 
@@ -178,9 +178,9 @@ class ClassLoader {
                $loaderInstance = self::getSelfInstance();
 
                // Load all classes
-               foreach (self::$frameworkPaths as $className) {
+               foreach (self::$frameworkPaths as $pathName) {
                        // Try to load the framework classes
-                       $loaderInstance->scanClassPath('inc/classes/' . $className . '/');
+                       $loaderInstance->scanClassPath('inc/main/' . $pathName . '/');
                } // END - foreach
        }
 
@@ -235,7 +235,7 @@ class ClassLoader {
                } // END - if
 
                // IS the cache there?
-               if (file_exists($this->listCacheFQFN)) {
+               if (BaseFrameworkSystem::isReadableFile($this->listCacheFQFN)) {
                        // Get content
                        $cacheContent = file_get_contents($this->listCacheFQFN);
 
@@ -247,7 +247,7 @@ class ClassLoader {
                } // END - if
 
                // Does the class cache exist?
-               if (file_exists($this->classCacheFQFN)) {
+               if (BaseFrameworkSystem::isReadableFile($this->listCacheFQFN)) {
                        // Then include it
                        require($this->classCacheFQFN);
 
@@ -462,7 +462,7 @@ class ClassLoader {
        }
 
        /**
-        * Getter for a printable list of included classes/interfaces/exceptions
+        * Getter for a printable list of included main/interfaces/exceptions
         *
         * @param       $includeList    A printable include list
         */