Small fixes in sys_prefs update/retrieval.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1946e0f0c49fe3cbfce6b1626ee8998769673920..d31867ae69e25a91c917c0d5da443c7c6dacbfdf 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -22,6 +22,8 @@ $ -> Affected files
 02-Feb-2010 Janusz Dobrowolski
 # Missing closing bracket
 $ /sql/alter2.3.php
 02-Feb-2010 Janusz Dobrowolski
 # Missing closing bracket
 $ /sql/alter2.3.php

+# Small fixes in sys_prefs update/retrieve
+$ /admin/db/company_db.inc

 
 02-Feb-2010 Merged changes from main trunk 2.2.4-2.2.5 as follows
 ------------------------------- Release 2.2.5 ----------------------------------
 
 02-Feb-2010 Merged changes from main trunk 2.2.4-2.2.5 as follows
 ------------------------------- Release 2.2.5 ----------------------------------

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index bca6a1cc2671be4fba124b57b260c1921ca9d1f9..632bab18a4775f83cf93de32571eb9612f72d860 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -19,6 +19,8 @@ function update_company_prefs( $params )
                if (!db_query($sql. db_escape($value). " WHERE name=".db_escape($name),
                         "The company prefferences could not be updated "))
                        return false;
                if (!db_query($sql. db_escape($value). " WHERE name=".db_escape($name),
                         "The company prefferences could not be updated "))
                        return false;

+               // update cached value
+               $_SESSION['SysPrefs']->prefs[$name] = $value;

        }
        return true;
 }
        }
        return true;
 }


@@ -57,7 +59,7 @@ function get_company_pref($prefs = null, $tbpref = TB_PREF)
        if (!$prefs)
                return $all;
        elseif (is_string($prefs))
        if (!$prefs)
                return $all;
        elseif (is_string($prefs))

-               return $all[$prefs];
+               return @$all[$prefs];

 
        $ret = array();
        foreach($prefs as $name)
 
        $ret = array();
        foreach($prefs as $name)