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

fixed wrong default parameter for $callback_params, call_user_func_array requires an empty array and not null (gives a fatal error under php5.3)

Browse Source
This commit is contained in:
Ralf Becker 2009-06-08 15:46:45 +00:00
parent 35a2353a1e
commit c28be373a6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,11 +106,11 @@ class egw_cache
* @param string $app application storing data
* @param string $location location name for data
* @param callback $callback=null callback to get/create the value, if it's not cache
* @param array $callback_params=null array with parameters for the callback
* @param array $callback_params=array() array with parameters for the callback
* @param int $expiration=0 expiration time in seconds, default 0 = never
* @return mixed NULL if data not found in cache (and no callback specified)
*/
static public function getCache($level,$app,$location,$callback=null,array $callback_params=null,$expiration=0)
static public function getCache($level,$app,$location,$callback=null,array $callback_params=array(),$expiration=0)
{
switch($level)
{
@ -183,11 +183,11 @@ class egw_cache
* @param string $app application storing data
* @param string $location location name for data
* @param callback $callback=null callback to get/create the value, if it's not cache
* @param array $callback_params=null array with parameters for the callback
* @param array $callback_params=array() array with parameters for the callback
* @param int $expiration=0 expiration time in seconds, default 0 = never
* @return mixed NULL if data not found in cache (and no callback specified)
*/
static public function getTree($app,$location,$callback=null,array $callback_params=null,$expiration=0)
static public function getTree($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
{
return self::getCache(self::TREE,$app,$location,$callback,$callback_params,$expiration);
}
@ -224,11 +224,11 @@ class egw_cache
* @param string $app application storing data
* @param string $location location name for data
* @param callback $callback=null callback to get/create the value, if it's not cache
* @param array $callback_params=null array with parameters for the callback
* @param array $callback_params=array() array with parameters for the callback
* @param int $expiration=0 expiration time in seconds, default 0 = never
* @return mixed NULL if data not found in cache (and no callback specified)
*/
static public function getInstance($app,$location,$callback=null,array $callback_params=null,$expiration=0)
static public function getInstance($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
{
return self::getCache(self::INSTANCE,$app,$location,$callback,$callback_params,$expiration);
}
@ -274,11 +274,11 @@ class egw_cache
* @param string $app application storing data
* @param string $location location name for data
* @param callback $callback=null callback to get/create the value, if it's not cache
* @param array $callback_params=null array with parameters for the callback
* @param array $callback_params=array() array with parameters for the callback
* @param int $expiration=0 expiration time in seconds, default 0 = never
* @return mixed NULL if data not found in cache (and no callback specified)
*/
static public function &getSession($app,$location,$callback=null,array $callback_params=null,$expiration=0)
static public function &getSession($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
{
if (isset($_SESSION[egw_session::EGW_SESSION_ENCRYPTED]))
{
@ -344,11 +344,11 @@ class egw_cache
* @param string $app application storing data
* @param string $location location name for data
* @param callback $callback=null callback to get/create the value, if it's not cache
* @param array $callback_params=null array with parameters for the callback
* @param array $callback_params=array() array with parameters for the callback
* @param int $expiration=0 expiration time is NOT used for REQUEST!
* @return mixed NULL if data not found in cache (and no callback specified)
*/
static public function getRequest($app,$location,$callback=null,array $callback_params=null,$expiration=0)
static public function getRequest($app,$location,$callback=null,array $callback_params=array(),$expiration=0)
{
if (!isset(self::$request_cache[$app][$location]) && !is_null($callback))
{