From 4cc23eb9a354ab8d53567d5e53b2eba5e6b88238 Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Mon, 7 Jan 2019 15:04:37 +0800
Subject: [PATCH] Pman/Roo.php

---
 Pman/Roo.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Pman/Roo.php b/Pman/Roo.php
index 037f25c..162bc63 100644
--- a/Pman/Roo.php
+++ b/Pman/Roo.php
@@ -443,6 +443,20 @@ 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)) {
@@ -460,12 +474,7 @@ 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,
@@ -501,12 +510,7 @@ class Pman_Roo extends Pman
         foreach($data as $x) {
             //echo "<PRE>"; print_r(array($_REQUEST['csvCols'], $x->toArray())); exit;
             $line = array();
-            if ($titles== '*') {
-                $titles= array_keys($x);
-            }
-            if ($cols== '*') {
-                $cols= array_keys($x);
-            }
+            
             
             if ($titles !== false) {
                 foreach($cols as $i=>$col) {
-- 
2.39.2