From 92e3a83be195fcd354705e1d038be3504b45885d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 3 May 2012 18:06:27 +0000 Subject: [PATCH] changed order of run call, to get infolog and timesheet list working again --- etemplate/inc/class.etemplate_widget_nextmatch.inc.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php index f7d58d9d5b..6bbad6f2a3 100644 --- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php +++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php @@ -92,11 +92,12 @@ class etemplate_widget_nextmatch extends etemplate_widget * Sending a first chunk of rows * * @param string $cname + * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont' */ - public function beforeSendToClient($cname) + public function beforeSendToClient($cname, array $expand) { $attrs = $this->attrs; - $form_name = self::form_name($cname, $this->id); + $form_name = self::form_name($cname, $this->id, $expand); $value =& self::get_array(self::$request->content, $form_name, true); $value['start'] = 0; @@ -731,8 +732,8 @@ class etemplate_widget_nextmatch extends etemplate_widget // Need this check or the headers will get involved too if($this->type == 'nextmatch') { - if ($this->id) $cname = self::form_name($cname, $this->id, $params[1]); parent::run($method_name, $params, $respect_disabled); + if ($this->id) $cname = self::form_name($cname, $this->id, $params[1]); if ($this->attrs['template']) {