[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [FIX] multi: Get the correct credentials file everywhere

Jonny Bradley pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki


Commits:
e420fea8 by Jonny Bradley at 2026-07-13T15:34:56+00:00
[FIX] multi: Get the correct credentials file everywhere
---
* [FIX] multi: Get the correct credentials file everywhere
---
* [FIX] phpstan fix also needed here (oops)

* [FIX] phpstan amd phpcs fixes

* [FIX] multi: Get the correct credentials file everywhere

See merge request tikiwiki/tiki!10703


(cherry picked from commit 4bad3b88b6a0a5c49625c99f6306540800ad0228)

28f5d572 [FIX] multi: Get the correct credentials file everywhere
c1fd57e1 [FIX] phpstan amd phpcs fixes
672e0315 [FIX] phpstan fix also needed here (oops)

Co-authored-by: Jonny Bradley <[email protected]>

See merge request tikiwiki/tiki!10710

- - - - -


3 changed files:

- lib/admin/adminlib.php
- lib/debug/Tracer.php
- lib/tikilib.php


Changes:

=====================================
lib/admin/adminlib.php
=====================================
@@ -581,8 +581,10 @@ class AdminLib extends TikiLib
         global $system_configuration_files;
         $show_warning = false;
 
-        if (file_exists(TIKI_CONFIG_FILE_PATH)) {
-            include(TIKI_CONFIG_FILE_PATH);
+        // Get local.php path including for multitiki
+        $configFilePath = \Tiki\TikiInit::getCredentialsFile();
+        if (file_exists($configFilePath)) {
+            include($configFilePath);
 
             foreach ($system_configuration_files as $configFile) {
                 if (isset($configFile) && file_exists($configFile)) {


=====================================
lib/debug/Tracer.php
=====================================
@@ -136,8 +136,10 @@ class Tracer
     }
 }
 
-if (file_exists(TIKI_CONFIG_FILE_PATH) && ! defined('TIKI_IN_TEST')) {
-    include TIKI_CONFIG_FILE_PATH;
+$configFilePath = \Tiki\TikiInit::getCredentialsFile();
+
+if (file_exists($configFilePath) && ! defined('TIKI_IN_TEST')) {
+    include $configFilePath;
 }
 global $tiki_traces_fpath, $tiki_traces_are_on, $tiki_traces_active_ids, $tracer;
 $tracer = new Tracer($tiki_traces_fpath, $tiki_traces_are_on, $tiki_traces_active_ids);


=====================================
lib/tikilib.php
=====================================
@@ -596,7 +596,7 @@ class TikiLib extends TikiDb_Bridge
                 $dbhost = $info['host'];
                 $database = $info['database'];
 
-                require TIKI_CONFIG_FILE_PATH;
+                require TikiInit::getCredentialsFile();
                 $dbsqlplugin = new PDO("$dbdriver:host=$dbhost;dbname=$database", $dbuserid, $dbpassword);
                 $connectionMap[$name] = new PdoDb($dbsqlplugin);
             }



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/e420fea84777f0802b6904ce49a177fe0ab62504

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/e420fea84777f0802b6904ce49a177fe0ab62504
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs