From f16224ae828e43204cf334681941c27f179e09c3 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 4 Mar 2009 14:52:47 +0000 Subject: Work around for Kohana ticket #1156 http://dev.kohanaphp.com/ticket/1156 --- kohana/libraries/Database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kohana/libraries/Database.php') 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 -- cgit v1.2.3