From f2a0232aca7ed6e34f2cba80cb2862d7d3e644d7 Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Tue, 6 Jul 2010 13:37:59 +0000
Subject: [PATCH] refs r2426 - added loadClass() method
git-svn-id: http://dev.piwik.org/svn/trunk@2434 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/DataTable/Renderer.php | 4 ++--
core/Loader.php | 17 ++++++++++++++++-
core/Session.php | 7 ++++++-
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php
index 6fd073d5fb..84efd8c935 100644
--- a/core/DataTable/Renderer.php
+++ b/core/DataTable/Renderer.php
@@ -117,7 +117,7 @@ abstract class Piwik_DataTable_Renderer
$className = 'Piwik_DataTable_Renderer_' . $name;
try {
- Piwik_Loader::autoload($className);
+ Piwik_Loader::loadClass($className);
return new $className;
} catch(Exception $e) {
$availableRenderers = implode(', ', self::getRenderers());
@@ -135,4 +135,4 @@ abstract class Piwik_DataTable_Renderer
{
return htmlentities($rawData, ENT_COMPAT, "UTF-8");
}
-}
\ No newline at end of file
+}
diff --git a/core/Loader.php b/core/Loader.php
index bb4a04be35..b6d24e2b7b 100644
--- a/core/Loader.php
+++ b/core/Loader.php
@@ -47,8 +47,9 @@ class Piwik_Loader
* Load class by name
*
* @param string $class Class name
+ * @throws Exception if class not found
*/
- public static function autoload($class)
+ public static function loadClass($class)
{
$classPath = self::getClassFileName($class);
while(!empty($classPath))
@@ -71,6 +72,20 @@ class Piwik_Loader
$lastSlash = strrpos($classPath, '/');
$classPath = ($lastSlash === false) ? '' : substr($classPath, 0, $lastSlash);
}
+ throw new Exception("Class \"$class\" not found.");
+ }
+
+ /**
+ * Autoloader
+ *
+ * @param string $class Class name
+ */
+ public static function autoload($class)
+ {
+ try {
+ @self::loadClass($class);
+ } catch (Exception $e) {
+ }
}
}
diff --git a/core/Session.php b/core/Session.php
index 49969f2066..490e1b2ce5 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -67,6 +67,11 @@ class Piwik_Session extends Zend_Session
}
}
- Zend_Session::start();
+ try {
+ Zend_Session::start();
+ } catch(Exception $e) {
+ // This message is not translateable because translations haven't been loaded yet.
+ Piwik_ExitWithMessage('Unable to start session. Check that session.save_path or tmp/sessions is writeable.');
+ }
}
}
--
GitLab