* BugTrack2/246: Should use array_key_exists($maybe, $null) here (patched by sonots).

* Please don't memorize the $result itself.

diff --git a/lib/plugin.php b/lib/plugin.php
index bcf35a8..9c6a201 100644 (file)
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -72,14 +72,15 @@ function do_plugin_init($name)
 {
        static $checked = array();
 
-       if (isset($checked[$name])) return $checked[$name];
+       // TRUE or FALSE or NULL (Return nothing / Not exists)
+       if (array_key_exists($name, $checked)) return $checked[$name];
 
        $func = 'plugin_' . $name . '_init';
        if (function_exists($func)) {
-               // TRUE or FALSE or NULL (return nothing)
-               $checked[$name] = call_user_func($func);
+               $result = call_user_func($func);
+               $checked[$name] = ($result === NULL) ? NULL : (bool)$result;
        } else {
-               $checked[$name] = NULL; // Not exist
+               $checked[$name] = NULL;
        }
 
        return $checked[$name];