holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed exception stalling new installs

Browse Source
This commit is contained in:
Ralf Becker 2011-11-10 10:09:37 +00:00
parent ad6cf1d8ae
commit 64c076c536
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.egw_cache.inc.php
View File

@ -128,7 +128,12 @@ class egw_cache
{ {
return null; return null;
} }
try {
$data = $provider->get($keys=self::keys($level,$app,$location)); $data = $provider->get($keys=self::keys($level,$app,$location));
}
catch(Exception $e) {
$data = null;
}
if (is_null($data) && !is_null($callback)) if (is_null($data) && !is_null($callback))
{ {
//error_log(__METHOD__."($level,$app,$location,".array2string($callback).','.array2string($callback_params).",$expiration) calling calback to create data."); //error_log(__METHOD__."($level,$app,$location,".array2string($callback).','.array2string($callback_params).",$expiration) calling calback to create data.");

1
phpgwapi/setup/default_records.inc.php
View File

@ -161,6 +161,7 @@ foreach(array(
'sessions_checkip' => 'True', 'sessions_checkip' => 'True',
'image_type' => '1', 'image_type' => '1',
'asyncservice' => 'fallback', 'asyncservice' => 'fallback',
'install_id' => md5(microtime(true).common::randomstring(15)),
) as $name => $value) ) as $name => $value)
{ {
$oProc->insert($GLOBALS['egw_setup']->config_table,array( $oProc->insert($GLOBALS['egw_setup']->config_table,array(