projects
/
Pman.Base
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4f28649
)
Pman/Roo.php
author
Edward
<edward@roojs.com>
Mon, 7 Jan 2019 07:06:11 +0000
(15:06 +0800)
committer
Edward
<edward@roojs.com>
Mon, 7 Jan 2019 07:06:11 +0000
(15:06 +0800)
Pman/Roo.php
patch
|
blob
|
history
diff --git
a/Pman/Roo.php
b/Pman/Roo.php
index
c9f4740
..
362dfb7
100644
(file)
--- a/
Pman/Roo.php
+++ b/
Pman/Roo.php
@@
-443,20
+443,6
@@
class Pman_Roo extends Pman
'leave_open' => true
);
'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)) {
$se = false;
if (is_object($data)) {
@@
-474,7
+460,12
@@
class Pman_Roo extends Pman
}
if ($titles !== false) {
}
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,
foreach($cols as $i=>$col) {
$se_config['cols'][] = array(
'header'=> isset($titles[$i]) ? $titles[$i] : $col,