Changeset 528

Timestamp:

Jun 21, 2015 3:23:30 PM (9 years ago)

Author:

anonymous

Message:

 

File:

• trunk/lib/App.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -350 +350 @@
 
             // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -rw-------
-            if (defined('_CLI')) {
+            // But only if db_pass hasn't been defined yet by other means.
+            if (defined('_CLI') && !$this->getParam('db_server') && !$this->getParam('db_name') && !$this->getParam('db_user') && !$this->getParam('db_pass')) {
                 if (false !== $db_auth_file = stream_resolve_include_path($this->getParam('db_auth_file'))) {
                     if (is_readable($db_auth_file)) {