Fixed company prefs refresh after upgrade/restore.

[fa-stable.git] / admin / db / company_db.inc

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index b39884548a193016e2efeae2e486969c1d83f99b..fffd3cb318efd711993ce832dc9b4e701d5fafc7 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -30,14 +30,17 @@ function update_company_prefs( $params, $pref = TB_PREF )
        $prefs can be preference name, array of names, or null for all preferences.
        
 */
-function get_company_pref($prefs = null, $tbpref = TB_PREF)
+function get_company_pref($prefs = null, $tbpref = null)
 {
-       global $SysPrefs, $core_version;
+       global $SysPrefs, $db_version;
        
        if (!isset($_SESSION['SysPrefs']->prefs)) { // cached preferences
 
                $_SESSION['SysPrefs'] = new sys_prefs();
 
+               if (!isset($tbpref))
+                       $tbpref = TB_PREF;
+
                $sql = "SELECT name, value FROM {$tbpref}sys_prefs";
                $result = @db_query($sql); // supress errors before 2.3 db structure upgrade
 
@@ -51,7 +54,7 @@ function get_company_pref($prefs = null, $tbpref = TB_PREF)
                $SysPrefs = &$_SESSION['SysPrefs'];
 
                // update current db status for info in log file
-               $SysPrefs->db_ok = $SysPrefs->prefs['version_id'] == $core_version;
+               $SysPrefs->db_ok = $SysPrefs->prefs['version_id'] == $db_version;
        }
 
        $all = $_SESSION['SysPrefs']->prefs;
@@ -73,6 +76,13 @@ function get_company_prefs($tbpref = TB_PREF)
        return get_company_pref(null, $tbpref);
 }
 
+function refresh_sys_prefs()
+{
+       flush_dir(company_path().'/js_cache'); // clear cache
+       unset($_SESSION['SysPrefs']);
+       get_company_prefs();
+}
+
 function get_base_sales_type()
 {
        return get_company_pref('base_sales');
@@ -81,7 +91,7 @@ function get_base_sales_type()
 function get_company_extensions($id = -1) {
        global $path_to_root;
 
-       $file = $path_to_root.($id == -1 ? '' : '/company/'.$id).'/installed_extensions.php';
+       $file = $path_to_root.($id == -1 ? '' : '/company/'.(int)$id).'/installed_extensions.php';
        $installed_extensions = array();
        if (is_file($file)) {
                include($file);