Changeset 313 for trunk/trax/vendor/trax/php_shell.php

Timestamp:

07/07/09 21:57:06 (3 years ago)

Author:

john

Message:

updates

Files:

• trunk/trax/vendor/trax/php_shell.php (modified) (2 diffs)

trunk/trax/vendor/trax/php_shell.php

@@ -50 +50 @@
 function __shell_default_error_handler($errno, $errstr, $errfile, $errline, $errctx) {
     ## ... what is this errno again ?
-    if(in_array($errno, array(8,2048))) return;
-    print sprintf("\r\nError No:%d - %s", $errno, $errstr);
-    #throw new Exception(sprintf("%s:%d\r\n%s", $errfile, $errline, $errstr));
+    if ($errno == 2048 || $errno == 8) return;  
+    throw new Exception(sprintf("%s:%d\r\n%s", $errfile, $errline, $errstr));
 }
 
@@ -98 +97 @@
                 if (function_exists("__shell_print_var")) {
                     __shell_print_var($__shell_retval, $__shell->getVerbose());
-                } else {
-                    if(is_object($__shell_retval) && get_parent_class($__shell_retval) == 'ActiveRecord') {
-                        print $__shell_retval;
+                } else {   
+                    if(is_object($__shell_retval) && method_exists($__shell_retval, '__toString')) {
+                        echo "Class:".get_class($__shell_retval)."\n".$__shell_retval->__toString();
                     } else {
                         var_export($__shell_retval);