give plugins a chance to autoload their classes

diff --git a/EVENTS.txt b/EVENTS.txt
index e1dd7350827b055ab95178be21a74d070ab7f92d..933907933ffc759454e4297836d6667ac0f266be 100644 (file)
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -134,3 +134,6 @@ StartAccountSettingsNav: Before showing the account settings menu
 
 EndAccountSettingsNav: After showing the account settings menu
 - $action: the current action
+
+Autoload: When trying to autoload a class
+- $cls: the class being sought. A plugin might require_once the file for the class.

diff --git a/lib/common.php b/lib/common.php
index 0ebaf7964dbad24e7f60a694b2d2befafbf0cc5d..5cecf309a0bbd1390f13dacf8c832e2a7deb5861 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -381,17 +381,19 @@ require_once INSTALLDIR.'/lib/serverexception.php';
 
 define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
 
-function __autoload($class)
+function __autoload($cls)
 {
-    if ($class == 'OAuthRequest') {
+    if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
+        require_once(INSTALLDIR.'/classes/' . $cls . '.php');
+    } else if (file_exists(INSTALLDIR.'/lib/' . strtolower($cls) . '.php')) {
+        require_once(INSTALLDIR.'/lib/' . strtolower($cls) . '.php');
+    } else if (mb_substr($cls, -6) == 'Action' &&
+               file_exists(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php')) {
+        require_once(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
+    } else if ($cls == 'OAuthRequest') {
         require_once('OAuth.php');
-    } else if (file_exists(INSTALLDIR.'/classes/' . $class . '.php')) {
-        require_once(INSTALLDIR.'/classes/' . $class . '.php');
-    } else if (file_exists(INSTALLDIR.'/lib/' . strtolower($class) . '.php')) {
-        require_once(INSTALLDIR.'/lib/' . strtolower($class) . '.php');
-    } else if (mb_substr($class, -6) == 'Action' &&
-               file_exists(INSTALLDIR.'/actions/' . strtolower(mb_substr($class, 0, -6)) . '.php')) {
-        require_once(INSTALLDIR.'/actions/' . strtolower(mb_substr($class, 0, -6)) . '.php');
+    } else {
+        Event::handle('Autoload', array(&$cls));
     }
 }