Changeset 726

Timestamp:

May 24, 2020 5:19:18 PM (4 years ago)

Author:

anonymous

Message:

 

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• Lock.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -428 +428 @@
             // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -r--------
             // But not if all DB credentials have been defined already by other means.
-            if ($this->cli && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
+            if ($this->cli && '' != $this->getParam('db_auth_file') && (!$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)) {

trunk/lib/Lock.inc.php

@@ -267 +267 @@
     public function set($record_table, $record_key, $record_val, $title='')
     {
+        $app =& App::getInstance();
         $db =& DB::getInstance();