From 64c076c5364989fe2854f46cb6ecd7e6f2096170 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 10 Nov 2011 10:09:37 +0000 Subject: [PATCH] fixed exception stalling new installs --- phpgwapi/inc/class.egw_cache.inc.php | 7 ++++++- phpgwapi/setup/default_records.inc.php | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php index 9198a745b5..74b5505d70 100644 --- a/phpgwapi/inc/class.egw_cache.inc.php +++ b/phpgwapi/inc/class.egw_cache.inc.php @@ -128,7 +128,12 @@ class egw_cache { return null; } - $data = $provider->get($keys=self::keys($level,$app,$location)); + try { + $data = $provider->get($keys=self::keys($level,$app,$location)); + } + catch(Exception $e) { + $data = null; + } if (is_null($data) && !is_null($callback)) { //error_log(__METHOD__."($level,$app,$location,".array2string($callback).','.array2string($callback_params).",$expiration) calling calback to create data."); diff --git a/phpgwapi/setup/default_records.inc.php b/phpgwapi/setup/default_records.inc.php index 5de2c053d7..d6f05de781 100644 --- a/phpgwapi/setup/default_records.inc.php +++ b/phpgwapi/setup/default_records.inc.php @@ -161,6 +161,7 @@ foreach(array( 'sessions_checkip' => 'True', 'image_type' => '1', 'asyncservice' => 'fallback', + 'install_id' => md5(microtime(true).common::randomstring(15)), ) as $name => $value) { $oProc->insert($GLOBALS['egw_setup']->config_table,array(