extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

flushing instance cache and config cache, after saving minimal config, fixing default_records of apps use not up to date data

Browse Source
This commit is contained in:
Ralf Becker 2014-05-13 09:32:21 +00:00
parent 1aef94735c
commit e4e4aa97bc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpgwapi/inc/class.config.inc.php
View File

@ -253,7 +253,7 @@ class config
*/ */
private static function _check_private_cf($private) private static function _check_private_cf($private)
{ {
static $user_and_memberships; static $user_and_memberships = null;
if (!$private) if (!$private)
{ {
@ -282,7 +282,7 @@ class config
$changed = 0; $changed = 0;
if (($cfs = self::get_customfields($app, true))) if (($cfs = self::get_customfields($app, true)))
{ {
foreach($cfs as $name => &$data) foreach($cfs as &$data)
{ {
if ($data['private']) if ($data['private'])
{ {
@ -353,7 +353,7 @@ class config
'phpgwapi' => array('webserver_url','server_timezone','enforce_ssl','system_charset', 'phpgwapi' => array('webserver_url','server_timezone','enforce_ssl','system_charset',
'checkfornewversion','checkappversions','email_address_format', // admin >> site config 'checkfornewversion','checkappversions','email_address_format', // admin >> site config
'site_title','login_logo_file','login_logo_url','login_logo_title','favicon_file', 'site_title','login_logo_file','login_logo_url','login_logo_title','favicon_file',
'markuntranslated','link_list_thumbnail','enabled_spellcheck', 'markuntranslated','link_list_thumbnail','enabled_spellcheck','debug_minify',
'call_link','call_popup', // addressbook 'call_link','call_popup', // addressbook
'hide_birthdays'), // calendar 'hide_birthdays'), // calendar
'projectmanager' => array('hours_per_workday', 'duration_units'), 'projectmanager' => array('hours_per_workday', 'duration_units'),
@ -385,13 +385,11 @@ class config
} }
/** /**
* Initialise our db * Initialise class: reference to db and self::$configs cache
*
* We use a reference here (no clone), as we no longer use egw_db::row() or egw_db::next_record()!
*
*/ */
private static function init_static() public static function init_static()
{ {
// we use a reference here (no clone), as we no longer use egw_db::row() or egw_db::next_record()!
if (is_object($GLOBALS['egw']->db)) if (is_object($GLOBALS['egw']->db))
{ {
config::$db = $GLOBALS['egw']->db; config::$db = $GLOBALS['egw']->db;

2
setup/inc/class.setup_process.inc.php
View File

@ -297,6 +297,8 @@ class setup_process
// so the default_records use the current data // so the default_records use the current data
$GLOBALS['egw_info']['server'] = array_merge((array)$GLOBALS['egw_info']['server'], $current_config); $GLOBALS['egw_info']['server'] = array_merge((array)$GLOBALS['egw_info']['server'], $current_config);
egw_cache::generate_instance_key(); // generate instance-key flushes whole instance cache
config::init_static(); // flush internal cache of config class
$GLOBALS['egw_setup']->setup_account_object($current_config); $GLOBALS['egw_setup']->setup_account_object($current_config);
} }