diff options
| author | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-09-11 17:50:41 +0200 |
|---|---|---|
| committer | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-09-11 17:50:41 +0200 |
| commit | bfe0abdd90efd7715d2c25bab0abd0a6912e96d9 (patch) | |
| tree | c1c5855da2364bc866b355d4c03afbceb09cbba3 /framework | |
| parent | e041f12667fb4ebd86e10a5a5bc4f3ed37efb278 (diff) | |
Try to go back to default autoload.
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/PradoBase.php | 7 | ||||
| -rw-r--r-- | framework/pradolite.php | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/framework/PradoBase.php b/framework/PradoBase.php index 7cb7e841..f75cc680 100644 --- a/framework/PradoBase.php +++ b/framework/PradoBase.php @@ -98,10 +98,9 @@ class PradoBase */ public static function autoload($className) { - if ((@include($className.self::CLASS_FILE_EXT)) !== false) { - return true; - } - return false; + include_once($className.self::CLASS_FILE_EXT); + if(!class_exists($className,false) && !interface_exists($className,false)) + self::fatalError("Class file for '$className' cannot be found."); } /** diff --git a/framework/pradolite.php b/framework/pradolite.php index 2b75df89..d5acd449 100644 --- a/framework/pradolite.php +++ b/framework/pradolite.php @@ -1,7 +1,7 @@ <?php /** * File Name: pradolite.php - * Last Update: 2013/09/11 16:01:18 + * Last Update: 2013/09/11 16:55:33 * Generated By: buildscripts/phpbuilder/build.php * * This file is used in lieu of prado.php to boost PRADO application performance. @@ -34,10 +34,9 @@ class PradoBase } public static function autoload($className) { - if ((@include($className.self::CLASS_FILE_EXT)) !== false) { - return true; - } - return false; + include_once($className.self::CLASS_FILE_EXT); + if(!class_exists($className,false) && !interface_exists($className,false)) + self::fatalError("Class file for '$className' cannot be found."); } public static function poweredByPrado($logoType=0) { |