From aa72d7cef5599ffea16193ede000bcf8d005fb18 Mon Sep 17 00:00:00 2001
From: icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 28 May 2008 11:16:36 +0000
Subject: Marcus Povey <marcus@dushka.co.uk> * Fixed tables

git-svn-id: https://code.elgg.org/elgg/trunk@737 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/database.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'engine/lib/database.php')

diff --git a/engine/lib/database.php b/engine/lib/database.php
index 7ddf4591b..73d22d28f 100644
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -70,7 +70,7 @@
 		{
 			global $CONFIG;
 			
-			$this->table = $CONFIG->prefix . sanitise_string($table);
+			$this->table = $CONFIG->dbprefix . sanitise_string($table);
 			$this->field = sanitise_string($field);
 		}
 		
@@ -136,7 +136,14 @@
 	{
 		function __construct($table)
 		{
-			$this->table = sanitise_string($table);
+			global $CONFIG;
+			
+			$this->table = $CONFIG->dbprefix . sanitise_string($table);
+		}
+		
+		function __toString()
+		{
+			return $this->table;
 		}
 	}
 	
-- 
cgit v1.2.3