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

fixed empty resultset if num_rows option is not defined, removed some weird indents

Browse Source
This commit is contained in:
Christian Binder 2009-12-16 13:10:55 +00:00
parent b48c4f51fc
commit 86346deefe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpgwapi/inc/class.egw_link.inc.php
View File

@ -572,9 +572,9 @@ class egw_link extends solink
elseif(is_object($obj) && method_exists($obj,$method)) elseif(is_object($obj) && method_exists($obj,$method))
{ {
$result = $obj->$method($pattern,$options); $result = $obj->$method($pattern,$options);
} }
else else
{ {
// Fall back to original method // Fall back to original method
$result = ExecMethod2($method,$pattern,$options); $result = ExecMethod2($method,$pattern,$options);
} }
@ -583,9 +583,9 @@ class egw_link extends solink
{ {
$options['total'] = count($result); $options['total'] = count($result);
} }
if (is_array($result) && (isset($options['start']) || count($result) > $options['num_rows'])) if (is_array($result) && (isset($options['start']) || (isset($options['num_rows']) && count($result) > $options['num_rows'])))
{ {
$result = array_slice($result, $options['start'], $options['num_rows'], true); $result = array_slice($result, $options['start'], (isset($options['num_rows']) ? $options['num_rows'] : count($result)), true);
} }
return $result; return $result;