Correctly load the DCA labels

Author: aschempp

core-bundle/src/Resources/contao/library/Contao/DcaLoader.php

@@ -138,20 +138,6 @@ private function loadDcaFiles($blnNoCache)
 	 */
 	private function addDefaultLabels($blnNoCache)
 	{
-		// Return if there are no labels
-		if (!isset(static::$arrLanguageFiles[$this->strTable]))
-		{
-			return;
-		}
-
-		// Return if the labels have been added already
-		if (!$blnNoCache && isset(static::$arrLoaded['languageFiles'][$this->strTable]))
-		{
-			return;
-		}
-
-		static::$arrLoaded['languageFiles'][$this->strTable] = true;
-
 		// Operations
 		foreach (array('global_operations', 'operations') as $key)
 		{
@@ -167,7 +153,7 @@ private function addDefaultLabels($blnNoCache)
 					continue;
 				}
 
-				if (isset($GLOBALS['TL_LANG'][$this->strTable][$k]))
+				if (isset($GLOBALS['TL_LANG'][$this->strTable][$k]) || !isset($GLOBALS['TL_LANG']['DCA'][$k]))
 				{
 					$v['label'] = &$GLOBALS['TL_LANG'][$this->strTable][$k];
 				}
@@ -190,10 +176,7 @@ private function addDefaultLabels($blnNoCache)
 					continue;
 				}
 
-				if (isset($GLOBALS['TL_LANG'][$this->strTable][$k]))
-				{
-					$v['label'] = &$GLOBALS['TL_LANG'][$this->strTable][$k];
-				}
+				$v['label'] = &$GLOBALS['TL_LANG'][$this->strTable][$k];
 			}
 
 			unset($v);