From 729c3abd02fc564fb99be53ba5fba450a073197f Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 2 May 2004 13:06:57 +0000
Subject: fix some issues with oop, fixing small bugs and prepare the next
 steps... NOTE TO DEVS: have a look at adm/admin_board.php (new config layout)

git-svn-id: file:///svn/phpbb/trunk@4883 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/db/mysql.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/db/mysql.php')

diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 5c982e7a2c..abfdd576f6 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -206,7 +206,7 @@ class sql_db
 
 			$query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
 		}
-		else if ($query == 'UPDATE')
+		else if ($query == 'UPDATE' || $query == 'SELECT')
 		{
 			$values = array();
 			foreach ($assoc_ary as $key => $var)
@@ -224,7 +224,7 @@ class sql_db
 					$values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var";
 				}
 			}
-			$query = implode(', ', $values);
+			$query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
 		}
 
 		return $query;
-- 
cgit v1.2.1