mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-21 02:18:28 +02:00
* Calendar: fix PHP Fatal: Unsupported operand types caused eg. by deleted resources
This commit is contained in:
parent
c846dfd441
commit
0cf37ba54d
@ -82,9 +82,9 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
|
|||||||
if(!is_numeric($owner))
|
if(!is_numeric($owner))
|
||||||
{
|
{
|
||||||
$resource = $bo->resources[substr($owner, 0,1)];
|
$resource = $bo->resources[substr($owner, 0,1)];
|
||||||
if($resource['info'])
|
if($resource['info'] && !($info = $bo->resource_info($owner)))
|
||||||
{
|
{
|
||||||
$info = $bo->resource_info($owner);
|
continue; // ignore that resource, we would get a PHP Fatal: Unsupported operand types
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (!in_array($owner, array_keys($accounts)))
|
else if (!in_array($owner, array_keys($accounts)))
|
||||||
@ -140,7 +140,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
|
|||||||
|
|
||||||
$bo = new calendar_bo();
|
$bo = new calendar_bo();
|
||||||
$query = $_REQUEST['query'];
|
$query = $_REQUEST['query'];
|
||||||
|
|
||||||
// Arbitrarily limited to 50 / resource
|
// Arbitrarily limited to 50 / resource
|
||||||
$options = array('start' => 0, 'num_rows' => 50) +
|
$options = array('start' => 0, 'num_rows' => 50) +
|
||||||
array_diff_key($_REQUEST, array_flip(array('menuaction','query')));
|
array_diff_key($_REQUEST, array_flip(array('menuaction','query')));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user