From 734301cc9c46f6e438edb7bb8af269ee095a0770 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 10 Nov 2010 11:42:01 +0000 Subject: [PATCH] Additional fix for setting local_path_to_root in find_custom_file() --- CHANGELOG.txt | 10 +++++++--- includes/main.inc | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3d89f86f..0c58ad49 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,14 +19,18 @@ Legend: ! -> Note $ -> Affected files +10-Nov-2010 Janusz Dobrowolski +# Additional fix for setting local_path_to_root in find_custom_file() +$ /includes/main.inc + 09-Nov-2010 Joe Hunt ! [0000277] Changed so FA suggest the next begin day in new Fiscal Year (read only). - But only if there are any fiscal years before. Otherwise is is normal. + But only if there are any fiscal years before. Otherwise it is normal. $ /admin/db/fiscalyears_db.inc /admin/fiscalyears.php - + 09-Nov-2010 Janusz Dobrowolski -# Session destroy added on install finish, fixed pasword/admin login update. +# Session destroy added on install finish, fixed pasword/admin login update, also [0000273]. $ /install/index.php 08-Nov-2010 Janusz Dobrowolski diff --git a/includes/main.inc b/includes/main.inc index ee756478..1f1078d5 100644 --- a/includes/main.inc +++ b/includes/main.inc @@ -326,11 +326,11 @@ function find_custom_file($rep) $extensions = $installed_extensions; foreach ($extensions as $ext) if (($ext['active'] && $ext['type'] == 'extension')) { - $local_path_to_root = $path = $path_to_root.'/'.$ext['path']; $file = $path.$rep; if (file_exists($file)) { set_include_path($path.PATH_SEPARATOR.get_include_path()); + $local_path_to_root = $path; return $file; } } -- 2.30.2