summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-03-04 18:58:32 +0000
committerTim Almdal <tnalmdal@shaw.ca>2009-03-04 18:58:32 +0000
commitd477ffd57522ca0698fc92e4ab5a767b2fba95ac (patch)
treee8711705bb9d0270788d2abb30a5dffb6c9c4635
parent014999758e2f4efa433a9c4e71d0551e0b5b318a (diff)
Annotate local fix for Kohana ticket #1156
-rw-r--r--kohana/libraries/Database.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/kohana/libraries/Database.php b/kohana/libraries/Database.php
index 0e02ec59..c1ff0764 100644
--- a/kohana/libraries/Database.php
+++ b/kohana/libraries/Database.php
@@ -299,7 +299,9 @@ class Database_Core {
{
if (preg_match('/^DISTINCT\s++(.+)$/i', $val, $matches))
{
+ /* ****** Begin Gallery 3 Local Change *********** */
$val = (strpos($matches[1], '.') !== FALSE) ? $this->config['table_prefix'].$matches[1] : $matches[1];
+ /* ****** End Gallery 3 Local Change *********** */
$this->distinct = TRUE;
}
else