aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authoricewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-05-28 11:16:36 +0000
committericewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-05-28 11:16:36 +0000
commitaa72d7cef5599ffea16193ede000bcf8d005fb18 (patch)
treea95cb29075a5319c8a483f907322075f780fd20f /engine
parent9158eb1eeab82d1d1c7cde31de405a2a4aebbcf9 (diff)
downloadelgg-aa72d7cef5599ffea16193ede000bcf8d005fb18.tar.gz
elgg-aa72d7cef5599ffea16193ede000bcf8d005fb18.tar.bz2
Marcus Povey <marcus@dushka.co.uk>
* Fixed tables git-svn-id: https://code.elgg.org/elgg/trunk@737 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/database.php11
1 files changed, 9 insertions, 2 deletions
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;
}
}