projects
/
pear
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eeccaff
)
DB/DataObject.php
author
edward
<edward@roojs.com>
Mon, 7 Sep 2015 08:07:21 +0000
(16:07 +0800)
committer
edward
<edward@roojs.com>
Mon, 7 Sep 2015 08:07:21 +0000
(16:07 +0800)
DB/DataObject.php
patch
|
blob
|
history
diff --git
a/DB/DataObject.php
b/DB/DataObject.php
index
717e20b
..
b2d79c0
100644
(file)
--- a/
DB/DataObject.php
+++ b/
DB/DataObject.php
@@
-4134,7
+4134,7
@@
class DB_DataObject extends DB_DataObject_Overload
$rf = ($this->_resultFields !== false) ? $this->_resultFields :
(isset($_DB_DATAOBJECT['RESULTFIELDS'][$this->_DB_resultid]) ?
$_DB_DATAOBJECT['RESULTFIELDS'][$this->_DB_resultid] : false);
- print_R($rf);exit;
+
$ar = ($rf !== false) ?
(($hideEmpty === 0) ? $rf : array_merge($rf, $this->table())) :
$this->table();