From 23b88e60f66acb00b8e5357dfe837301d1d5d1a2 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 16 Sep 2007 16:22:36 +0000
Subject: [PATCH] bfojcapell: change some old query processing code to a more
 robust one (merged from branches/gsoc)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42125 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/Translatable.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/model/Translatable.php b/core/model/Translatable.php
index 650dbe5d8..f74fc6d81 100755
--- a/core/model/Translatable.php
+++ b/core/model/Translatable.php
@@ -84,7 +84,7 @@ class Translatable extends DataObjectDecorator {
 	 */
 	static function choose_site_lang() {
 		if(isset($_GET['lang'])) {
-			$_GET['lang'] = ucfirst(strtolower($_GET['lang']));
+			$_GET['lang'] = strtolower($_GET['lang']);
 			Translatable::set_reading_lang($_GET['lang']);
 		}
 		else if($lang = Session::get('currentLang')) {
@@ -163,8 +163,8 @@ class Translatable extends DataObjectDecorator {
 		} else {
 			$langsAvailable = (array)Translatable::get_langs_by_id($callerClass, $record->ID);
 			$langsAvailable[] = Translatable::default_lang();
-			if(isset($_GET['lang']) && array_search(ucfirst(strtolower($_GET['lang'])),$langsAvailable) !== false) {
-				$lang = ucfirst(strtolower($_GET['lang']));
+			if(isset($_GET['lang']) && array_search(strtolower($_GET['lang']),$langsAvailable) !== false) {
+				$lang = strtolower($_GET['lang']);
 			} else if(($possible = Session::get('currentLang')) && array_search($possible,$langsAvailable)) {
 				$lang = $possible;
 			} else if (($member = Member::currentUser()) && ($possible = $member->PreferredLang)) {
@@ -303,18 +303,20 @@ class Translatable extends DataObjectDecorator {
 						else {
 							$parts = explode(' AND ',$wherecl);
 							foreach ($parts as $j => $part) {
-								if (strpos($part,'.') === false)
+								// Divide this clause between the left ($innerparts[1]) and right($innerparts[2]) part of the condition
+								ereg('(`?[[:alnum:]_-]*`?\.?`?[[:alnum:]_-]*`?)(.*)', $part, $innerparts);
+								if (strpos($innerparts[1],'.') === false)
 									//it may be ambiguous, so sometimes we will need to add the table
-									$parts[$j] = ($this->isInAugmentedTable($part, $table) ? "`{$table}_lang`." : "")."$part";
+									$parts[$j] = ($this->isInAugmentedTable($innerparts[1], $table) ? "`{$table}_lang`." : "")."$part";
 								else {
 									/* if the table has been specified we have to determine if the original (without _lang) name has to be used
 									 * because we don't have the queried field in the augmented table (which usually means
 									 * that is not a translatable field)
 									 */
-									$clauseparts = explode('.',$part);
+									$clauseparts = explode('.',$innerparts[1]);
 									$originalTable = str_replace('`','',str_replace('_lang','',$clauseparts[0]));
 									$parts[$j] = ($this->isInAugmentedTable($clauseparts[1], $originalTable) ? "`{$originalTable}_lang`" : "`$originalTable`") 
-												  . ".{$clauseparts[1]}";
+												  . ".{$clauseparts[1]}{$innerparts[2]}";
 								}
 							}
 							$query->where[$i] = implode(' AND ',$parts);