diff options
| -rw-r--r-- | core/Auth.php | 2 | ||||
| -rw-r--r-- | core/Loader.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/Auth.php b/core/Auth.php index 315a0fb341..526fcb0b10 100644 --- a/core/Auth.php +++ b/core/Auth.php @@ -9,6 +9,8 @@ * @package Piwik */ +require "Zend/Auth/Result.php"; + interface Piwik_Auth { /** * Authentication module's name, e.g., "Login" diff --git a/core/Loader.php b/core/Loader.php index 3745e8e144..97f5decd46 100644 --- a/core/Loader.php +++ b/core/Loader.php @@ -42,8 +42,8 @@ class Piwik_Loader $path = PIWIK_INCLUDE_PATH . self::$dirs[$i] . $classPath . '.php'; if(file_exists($path)) { - include_once($path); - if(class_exists($class, false)) + require_once($path); + if(class_exists($class, false) || interface_exists($class, false)) { return; } @@ -54,6 +54,7 @@ class Piwik_Loader $lastSlash = strrpos($classPath, '/'); $classPath = ($lastSlash === false) ? '' : substr($classPath, 0, $lastSlash); } + throw new Exception("$class could not be autoloaded."); } } |