Changeset 724 for trunk/lib/DB.inc.php

Timestamp:

May 4, 2020 2:25:31 AM (4 years ago)

Author:

anonymous

Message:

Use the /u regex modifier only when using UTF-8. Disable indexed array key removal from URL query args.

File:

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

trunk/lib/DB.inc.php

@@ -180 +180 @@
         if (!$this->dbh || mysql_error($this->dbh)) {
             $mysql_error_msg = $this->dbh ? 'Codebase MySQL connect error: (' . mysql_errno($this->dbh) . ') ' . mysql_error($this->dbh) : sprintf('Codebase MySQL connect error: Could not connect to server (db_server=%s, db_name=%s, db_user=%s, db_pass=%s)', $this->getParam('db_server'), $this->getParam('db_name'), $this->getParam('db_user'), ('' == $this->getParam('db_pass') ? 'NO' : 'YES'));
-            $app->logMsg($mysql_error_msg, LOG_EMERG, __FILE__, __LINE__);
+            $app->logMsg($mysql_error_msg, LOG_ERR, __FILE__, __LINE__);
 
             // Print helpful or pretty error?
@@ -346 +346 @@
         $this->_query_count++;
 
-        $debugqry = preg_replace("/\n[\t ]+/u", "\n", $query);
+        $debugqry = preg_replace('/\n[\t ]+/' . $app->getParam('preg_u'), "\n", $query);
         if ($this->getParam('db_always_debug') || $debug) {
             if ($debug > 1) {