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

Timestamp:

Aug 27, 2015 3:22:39 AM (9 years ago)

Author:

anonymous

Message:

Moved CLI flag to ->cli which can be forced off for tests

File:

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

trunk/lib/DB.inc.php

@@ -226 +226 @@
     protected function _fail()
     {
+        $app =& App::getInstance();
+
         if ($this->getParam('db_die_on_failure')) {
-            if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
+            if (!$app->cli) {
                 // For http requests, send a Service Unavailable header.
                 header(' ', true, 503);
@@ -323 +325 @@
             $app->logMsg(sprintf('MySQL error %s: %s in query: %s', mysql_errno($this->dbh), mysql_error($this->dbh), $debugqry), LOG_EMERG, __FILE__, __LINE__);
             if ($this->getParam('db_debug')) {
-                if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
+                if (!$app->cli) {
                     echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
                 }