extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 09:38:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

php5.2 fix and ability to return something from the get_rows function

Browse Source
This commit is contained in:
Ralf Becker 2007-01-22 07:06:15 +00:00
parent 7c9a806965
commit f53c68f94d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -48,6 +48,7 @@
* 'rows' => // O content set by callback * 'rows' => // O content set by callback
* 'total' => // O the total number of entries * 'total' => // O the total number of entries
* 'sel_options' => // O additional or changed sel_options set by the callback and merged into $tmpl->sel_options * 'sel_options' => // O additional or changed sel_options set by the callback and merged into $tmpl->sel_options
* 'return' => // IO allows to return something from the get_rows function if $query is a var-param!
* ); * );
* @package etemplate * @package etemplate
* @subpackage extensions * @subpackage extensions
@ -223,8 +224,14 @@
} }
else else
{ {
$total = $value['total'] = $obj->$method($value,$value['rows'],$readonlys['rows']); if (is_array($readonlys))
{
$total = $value['total'] = $obj->$method($value,$value['rows'],$readonlys['rows']);
}
else
{
$total = $value['total'] = $obj->$method($value,$value['rows'],$readonlys);
}
// allow the get_rows function to override / set sel_options // allow the get_rows function to override / set sel_options
if (isset($value['rows']['sel_options']) && is_array($value['rows']['sel_options'])) if (isset($value['rows']['sel_options']) && is_array($value['rows']['sel_options']))
{ {
@ -393,6 +400,7 @@
$old_value = $extension_data; $old_value = $extension_data;
$value['start'] = $old_value['start']; // need to be set, to be reported back $value['start'] = $old_value['start']; // need to be set, to be reported back
$value['return'] = $old_value['return'];
if (is_array($value['bottom'])) // we have a second bottom-bar if (is_array($value['bottom'])) // we have a second bottom-bar
{ {