cvs: pear /LiveUser_Admin/Storage SQL.php
| From: | Lukas Smith | Date: | Mon, 15 Aug 2005 20:46:11 +0000 |
| Subject: | cvs: pear /LiveUser_Admin/Storage SQL.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-33996@lists.php.net to get a copy of this message | ||
lsmith Mon Aug 15 16:46:11 2005 EDT
Modified files:
/pear/LiveUser_Admin/Storage SQL.php
Log:
- CS fix
- ensure that fields are properly aliased (bug #5059)
http://cvs.php.net/diff.php/pear/LiveUser_Admin/Storage/SQL.php?r1=1.33&r2=1.34&ty=u
Index: pear/LiveUser_Admin/Storage/SQL.php
diff -u pear/LiveUser_Admin/Storage/SQL.php:1.33 pear/LiveUser_Admin/Storage/SQL.php:1.34
--- pear/LiveUser_Admin/Storage/SQL.php:1.33 Sun Aug 14 04:30:19 2005
+++ pear/LiveUser_Admin/Storage/SQL.php Mon Aug 15 16:46:11 2005
@@ -57,7 +57,7 @@
* @author Bjoern Kraus <krausbn@php.net>
* @copyright 2002-2005 Markus Wolff
* @license http://www.gnu.org/licenses/lgpl.txt
- * @version CVS: $Id: SQL.php,v 1.33 2005/08/14 08:30:19 lsmith Exp $
+ * @version CVS: $Id: SQL.php,v 1.34 2005/08/15 20:46:11 lsmith Exp $
* @link http://pear.php.net/LiveUser_Admin
*/
@@ -399,8 +399,11 @@
$joinfilters = $result[0];
}
+ foreach ($fields as $key => $field) {
+ $fields[$key] = $this->alias[$field];
+ }
$tables = array_keys($tables);
- foreach($tables as $key => $table) {
+ foreach ($tables as $key => $table) {
$tables[$key] = $this->prefix.$this->alias[$table];
}
// build SELECT query