Fixes #3462 empty classes directory is no longer treated as an error

git-svn-id: http://code.elgg.org/elgg/trunk@9100 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index eb911455aab8ee7cc09948f1e1bb6cd901adad22..95a7362e24c5faa1827bbfa9a5770c6808194024 100644 (file)
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -839,12 +839,7 @@ class ElggPlugin extends ElggObject {
                        return true;
                }
 
-               // but need to have working ones.
-               if (!elgg_register_classes($classes_path)) {
-                       $msg = elgg_echo('ElggPlugin:Exception:CannotRegisterClasses',
-                                                       array($this->getID(), $this->guid, $classes_path));
-                       throw new PluginException($msg);
-               }
+               elgg_register_classes($classes_path);
 
                return true;
        }

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index e67f8b627a5d57985a342c44133dcb5caa57bff3..170750849cb70cc79689fd82da6ce5a51a04eb63 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -33,21 +33,15 @@ function _elgg_autoload($class) {
  *
  * @param string $dir The dir to look in
  *
- * @return true
+ * @return void
  * @since 1.8.0
  */
 function elgg_register_classes($dir) {
        $classes = elgg_get_file_list($dir, array(), array(), array('.php'));
 
-       if (!$classes) {
-               return false;
-       }
-
        foreach ($classes as $class) {
                elgg_register_class(basename($class, '.php'), $class);
        }
-
-       return true;
 }
 
 /**

diff --git a/languages/en.php b/languages/en.php
index ec39f64a9e7fa4e923bb3c36aedc825ed676c97d..768658c99239759ec6ccd2a366b602e7ca5114f4 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -81,7 +81,6 @@ $english = array(
        'ElggPlugin:Exception:CannotIncludeFile' => 'Cannot include %s for plugin %s (guid: %s) at %s.  Check permissions!',
        'ElggPlugin:Exception:CannotRegisterViews' => 'Cannot open views dir for plugin %s (guid: %s) at %s.  Check permissions!',
        'ElggPlugin:Exception:CannotRegisterLanguages' => 'Cannot register languages for plugin %s (guid: %s) at %s.  Check permissions!',
-       'ElggPlugin:Exception:CannotRegisterClasses' => 'Cannot register classes for plugin %s (guid: %s) at %s.  Check permissions!',
        'ElggPlugin:Exception:NoID' => 'No ID for plugin guid %s!',
 
        'PluginException:ParserError' => 'Error parsing manifest with API version %s in plugin %s.',