X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fcompany_db.inc;h=821caf601f4dad58ca54fbcb80e545c737210ca6;hb=1597df9b4601fd192966893a1782657671064ebc;hp=b39884548a193016e2efeae2e486969c1d83f99b;hpb=ade8fddea8e317ab91f9e57ca138f9f9f5cc7d8c;p=fa-stable.git diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc index b3988454..821caf60 100644 --- 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;