Changeset 697 for trunk/lib

Timestamp:

Aug 8, 2019 10:36:08 PM (5 years ago)

Author:

anonymous

Message:

Improve error display. Use \u flag on preg patterns.

File:

• trunk/lib/DB.inc.php (modified) (4 diffs)

trunk/lib/DB.inc.php

@@ -32 +32 @@
 class DB
 {
-
     // A place to keep an object instance for the singleton pattern.
     protected static $instance = null;
@@ -186 +185 @@
             // Print helpful or pretty error?
             if ($this->getParam('db_debug')) {
-                echo $mysql_error_msg . "\n";
+                if (!$app->isCLI()) {
+                    printf('<pre style="padding:1em;background:#ddd;font:0.9rem monospace;">%s</pre>', $mysql_error_msg);
+                }
             }
 
@@ -346 +347 @@
         $this->_query_count++;
 
-        $debugqry = preg_replace("/\n[\t ]+/", "\n", $query);
+        $debugqry = preg_replace("/\n[\t ]+/u", "\n", $query);
         if ($this->getParam('db_always_debug') || $debug) {
             if ($debug > 1) {
@@ -371 +372 @@
             if ($this->getParam('db_debug')) {
                 if (!$app->isCLI()) {
-                    echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
+                    echo '<pre style="padding:1em;background:#ddd;font:0.9rem monospace;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
                 }
             }