Additional fix for setting local_path_to_root in find_custom_file()

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3d89f86f819d04bd14e2fd920b6da5bebbad9e4a..0c58ad49abfdcf8a4e734922e66e098186481456 100644 (file)
--- 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 ee7564785f0d8d020ad50668938d9279799a22c5..1f1078d59e2256b39ad3eb06da4566174d221cf4 100644 (file)
--- 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;
                                }
                        }