lib/php/nb.php

diff --git a/lib/php/nb.php b/lib/php/nb.php
index be8e77b11f4741a2e6459c75fd93e9726950ea39..db34fac9e658edbd271d7a06739f4ca002a3e5cb 100644 (file)
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -57,7 +57,8 @@ class Nb {
         * Return the value set or existing
         */
        public static function pdef($name,$value) {
-               if (preg_match('/^\s*$/',self::p($name))) return self::pset($name,(!is_scalar($value) and is_callable($value)) ? $value() : $value);
+               if (preg_match('/^\s*$/',self::p($name,''))) 
+                       return self::pset($name,(!is_scalar($value) and is_callable($value)) ? $value() : $value);
                return self::p($name);
        }
 
@@ -615,7 +616,7 @@ class Nb {
        public static function class_action_out($class,$action) {
                $class_name = strtolower(get_class($class));
 
-               if (!preg_match('/^'.$class_name.'\.(\w+)/',$action,$m)) return null;
+               if ($action === null or !preg_match('/^'.$class_name.'\.(\w+)/',$action,$m)) return null;
                $name = $m[1];
 
                $rows = array();