From: Edward Date: Mon, 7 Jan 2019 07:06:11 +0000 (+0800) Subject: Pman/Roo.php X-Git-Url: http://git.roojs.org/?p=Pman.Base;a=commitdiff_plain;h=a9c16597a7f5a636e742b68a53d28de5ecdcc011 Pman/Roo.php --- diff --git a/Pman/Roo.php b/Pman/Roo.php index c9f4740..362dfb7 100644 --- a/Pman/Roo.php +++ b/Pman/Roo.php @@ -443,20 +443,6 @@ class Pman_Roo extends Pman 'leave_open' => true ); - if ($titles== '*') { - $titles= array_keys($x); - } - if ($cols== '*') { - $cols= array_keys($x); - } - - if(!is_array($titles)) { - $titles = explode(',', $titles); - } - if(!is_array($cols)) { - $cols = explode(',', $cols); - } - $se = false; if (is_object($data)) { @@ -474,7 +460,12 @@ class Pman_Roo extends Pman } if ($titles !== false) { - + if ($titles== '*') { + $titles= array_keys($x); + } + if(!is_array($titles)) { + $titles = explode(',', $titles); + } foreach($cols as $i=>$col) { $se_config['cols'][] = array( 'header'=> isset($titles[$i]) ? $titles[$i] : $col,