X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fmain.inc;h=1f1078d59e2256b39ad3eb06da4566174d221cf4;hb=0fd1eb74bd51889ce48a6ab5369e66a86cbe7da2;hp=fd4aa97759f8f26fd6e4c06cebccd6562034c38c;hpb=46adaa0c03e5bb3ec387cbd95483175be4f08dfb;p=fa-stable.git diff --git a/includes/main.inc b/includes/main.inc index fd4aa977..1f1078d5 100644 --- a/includes/main.inc +++ b/includes/main.inc @@ -302,20 +302,22 @@ function copy_file($file, $from, $to) /* Search for file, looking first for company specific version, then for version provided by any extension module, finally in main FA directory. - Also adds include path for any related files. + Also adds include path for any related files, and sets $local_path_to_root + to enable local translation domains. Returns found file path or null. */ function find_custom_file($rep) { - global $installed_extensions, $comp_path, $path_to_root; + global $installed_extensions, $path_to_root, $local_path_to_root; // customized per company version $path = company_path(); - $file = $path.'/'.$rep; + $file = $path.$rep; if (file_exists($file)) { // add local include path - set_include_path($path.PATH_SEPARATOR.get_include_path()); + $local_path_to_root = $path; + set_include_path(dirname($file).PATH_SEPARATOR.get_include_path()); return $file; } // file added by active extension modules @@ -328,6 +330,7 @@ function find_custom_file($rep) $file = $path.$rep; if (file_exists($file)) { set_include_path($path.PATH_SEPARATOR.get_include_path()); + $local_path_to_root = $path; return $file; } } @@ -340,5 +343,4 @@ function find_custom_file($rep) return null; } - ?> \ No newline at end of file