Skip to content

Commit

Permalink
Merge pull request #1727 from JackBlower/1.8/develop
Browse files Browse the repository at this point in the history
Quick fix for temporal join values.
  • Loading branch information
Steve "Uru" West committed Jul 9, 2014
2 parents 69eac80 + 898acd6 commit b1cb1db
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions classes/database/connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -659,11 +659,16 @@ public function quote_identifier($value)
return $this->quote_identifier($value).' AS '.$this->quote_identifier($alias);
}

if (preg_match('/^(["\']).*\1$/m', $value))
{
return $value;
}

if (strpos($value, '.') !== false)
{
// Split the identifier into the individual parts
// This is slightly broken, because a table or column name
// (or user-defined alias!) might legitimately contain a period.
// This is slightly broken, because a table or column name
// (or user-defined alias!) might legitimately contain a period.
$parts = explode('.', $value);

if ($prefix = $this->table_prefix())
Expand Down

0 comments on commit b1cb1db

Please sign in to comment.