cvs: pear /DB_QueryTool/QueryTool Query.php
| From: | Lorenzo Alberton | Date: | Tue, 17 Aug 2004 14:05:11 +0000 |
| Subject: | cvs: pear /DB_QueryTool/QueryTool Query.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-23002@lists.php.net to get a copy of this message | ||
quipo Tue Aug 17 10:05:11 2004 EDT
Modified files:
/pear/DB_QueryTool/QueryTool Query.php
Log:
- addLeftJoin(), bug if no left join was previously set (bug #2133)
- tabs to spaces
http://cvs.php.net/diff.php/pear/DB_QueryTool/QueryTool/Query.php?r1=1.50&r2=1.51&ty=u
Index: pear/DB_QueryTool/QueryTool/Query.php
diff -u pear/DB_QueryTool/QueryTool/Query.php:1.50 pear/DB_QueryTool/QueryTool/Query.php:1.51
--- pear/DB_QueryTool/QueryTool/Query.php:1.50 Sat Jul 31 05:42:22 2004
+++ pear/DB_QueryTool/QueryTool/Query.php Tue Aug 17 10:05:11 2004
@@ -15,7 +15,7 @@
// | Author: Wolfram Kriesing, Paolo Panto, vision:produktion <wk@visionp.de>
// +----------------------------------------------------------------------+
//
-// $Id: Query.php,v 1.50 2004/07/31 09:42:22 quipo Exp $
+// $Id: Query.php,v 1.51 2004/08/17 14:05:11 quipo Exp $
//
require_once 'PEAR.php';
@@ -1104,7 +1104,11 @@
}
$this->_join[$type]['table'] =
array_merge($this->_join[$type]['table'], $table);
if (!is_array($this->_join[$type]['where'])) {
- settype($this->_join[$type]['where'], 'array');
+ if (!empty($this->_join[$type]['where'])) {
+ settype($this->_join[$type]['where'], 'array');
+ } else {
+ $this->_join[$type]['where'] = array();
+ }
}
$this->_join[$type]['where'][] = $where;
}