[phpwiki-checkins] CVS: phpwiki/lib ErrorManager.php,1.41,1.42

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16675

Modified Files:
	ErrorManager.php 
Log Message:
re-enable colored boxed errors

Index: ErrorManager.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ErrorManager.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -2 -b -p -d -r1.41 -r1.42
--- ErrorManager.php	26 Dec 2004 17:08:36 -0000	1.41
+++ ErrorManager.php	26 Feb 2005 18:29:07 -0000	1.42
@@ -532,5 +532,5 @@ class PhpWikiError extends PhpError {
 
     function _getDetail() {
-        return HTML::div(//array('class' => $this->getHtmlClass()), 
+        return HTML::div(array('class' => $this->getHtmlClass()), 
                          HTML::p($this->getDescription() . ": $this->errstr"));
     }
@@ -580,5 +580,8 @@ class PhpErrorOnce extends PhpError {
            $dir .= '/';
         $errfile = preg_replace('|^' . preg_quote($dir) . '|', '', $this->errfile);
+        if (is_string($this->errstr))
         $lines = explode("\n", $this->errstr);
+	    elseif (is_object($this->errstr))
+	        $lines = array($this->errstr->asXML());
         $errtype = (DEBUG & _DEBUG_VERBOSE) ? sprintf("%s[%d]", $this->getDescription(), $this->errno)
                                             : sprintf("%s", $this->getDescription());
@@ -589,5 +592,5 @@ class PhpErrorOnce extends PhpError {
                        $count > 1 ? sprintf(" (...repeated %d times)",$count) : ""
                        );
-        $html = HTML::div(//array('class' => $this->getHtmlClass()), 
+        $html = HTML::div(array('class' => $this->getHtmlClass()), 
                           HTML::p($msg));
         if ($lines) {
@@ -609,4 +612,7 @@ if (!isset($GLOBALS['ErrorManager'])) {
 
 // $Log$
+// Revision 1.42  2005/02/26 18:29:07  rurban
+// re-enable colored boxed errors
+//
 // Revision 1.41  2004/12/26 17:08:36  rurban
 // php5 fixes: case-sensitivity, no & new