Author: ralfbecker
New Revision: 37187
URL: http://svn.stylite.de/viewvc/egroupware?rev=37187&view=rev
Log:
fixed exception stalling new installs
Modified:
trunk/phpgwapi/inc/class.egw_cache.inc.php
trunk/phpgwapi/setup/default_records.inc.php
Modified: trunk/phpgwapi/inc/class.egw_cache.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.egw_cache.inc.php?rev=37187&r1=37186&r2=37187&view=diff
— trunk/phpgwapi/inc/class.egw_cache.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_cache.inc.php Thu Nov 10 11:09:37 2011
@@ -128,7 +128,12 @@
{
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.");
Modified: trunk/phpgwapi/setup/default_records.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/setup/default_records.inc.php?rev=37187&r1=37186&r2=37187&view=diff
— trunk/phpgwapi/setup/default_records.inc.php (original)
+++ trunk/phpgwapi/setup/default_records.inc.php Thu Nov 10 11:09:37 2011
@@ -161,6 +161,7 @@
‘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(
RSA® Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs