summaryrefslogtreecommitdiff
path: root/kohana/libraries/Database.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-03-04 14:52:47 +0000
committerTim Almdal <tnalmdal@shaw.ca>2009-03-04 14:52:47 +0000
commitf16224ae828e43204cf334681941c27f179e09c3 (patch)
tree5aed14adb7b5383ec88d559d37f231b317de96c9 /kohana/libraries/Database.php
parent234aa2b31db3a8e593fbfecf28ac2d8a8701df7d (diff)
Work around for Kohana ticket #1156
http://dev.kohanaphp.com/ticket/1156
Diffstat (limited to 'kohana/libraries/Database.php')
-rw-r--r--kohana/libraries/Database.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/kohana/libraries/Database.php b/kohana/libraries/Database.php
index 7c484465..adbbcf56 100644
--- a/kohana/libraries/Database.php
+++ b/kohana/libraries/Database.php
@@ -299,7 +299,7 @@ class Database_Core {
{
if (preg_match('/^DISTINCT\s++(.+)$/i', $val, $matches))
{
- $val = $this->config['table_prefix'].$matches[1];
+ $val = (strpos($matches[1], '.') !== FALSE) ? $this->config['table_prefix'].$matches[1] : $matches[1];
$this->distinct = TRUE;
}
else