From: Jochen Rau <j.rau@web.de>
Date: Thu, 18 Feb 2010 13:59:55 +0000 (+0000)
Subject: [+BUGFIX] Extbase (Persistence): Removed testing code accidentally committed to trunk... 
X-Git-Tag: TYPO3_6-2-0alpha1~21^2~701
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/6cf627f0c732d730b10fd84d6f5b77aaa81c88d5?hp=1d86e247dc3339eacdbc3e39184245551b1ab8b2

[+BUGFIX] Extbase (Persistence): Removed testing code accidentally committed to trunk causing SQL errors for tables not having a sys_language_uid field. Follow-up to r1864. Related to #6409, #6288.
---

diff --git a/typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php b/typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php
index e01f9ef4007..5ca4b3fd1e7 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php
@@ -491,7 +491,7 @@ class Tx_Extbase_Persistence_Mapper_DataMapper implements t3lib_Singleton {
 		} else {
 			throw new Tx_Extbase_Persistence_Exception_UnexpectedTypeException('Could not determine the child object object type.', 1251315967);
 		}
-		return $elementType;	
+		return $elementType;
 	}
 
 	/**
diff --git a/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
index 5802fad8037..6b1a8035725 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
@@ -632,9 +632,6 @@ class Tx_Extbase_Persistence_Storage_Typo3DbBackend implements Tx_Extbase_Persis
 				$statement = substr($statement, 5);
 				$sql['additionalWhereClause'][] = $statement;
 			}
-			if(isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField']) && $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] != '') {
-				$sql['additionalWhereClause'][] =  $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' IN (0,-1) ';
-			}
 		}
 	}