Better fix for bug #5032: [LocalLang: 0?]DEF is sometimes displayed for content elements

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2153 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 63370d6..b388b08 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-20  Dmitry Dulepov  <dmitry@typo3.org>
+
+       * Better fix for bug #5032: [LocalLang: 0?]DEF is sometimes displayed for content elements
+
 2007-02-25  Oliver Hader  <oh@inpublica.de>
 
        * Fixed bug #5055: SQL problem with reviewstate in EM (thanks to Franz-Xaver Koch)

diff --git a/t3lib/class.t3lib_tceforms.php b/t3lib/class.t3lib_tceforms.php
index 10a1b81..a17be0c 100755 (executable)
--- a/t3lib/class.t3lib_tceforms.php
+++ b/t3lib/class.t3lib_tceforms.php
@@ -5347,7 +5347,7 @@ class t3lib_TCEforms      {
                        }
                }
 
-               return ($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['flagIcon'] ? '<img src="'.$this->cachedLanguageFlag[$mainKey][$sys_language_uid]['flagIcon'].'" class="absmiddle" alt="" />' : ($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['title'] ? '['.$this->cachedLanguageFlag[$mainKey][$sys_language_uid]['title'].']' : '[LangCode: '.$sys_language_uid.' ?]')).'&nbsp;';
+               return ($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['flagIcon'] ? '<img src="'.$this->cachedLanguageFlag[$mainKey][$sys_language_uid]['flagIcon'].'" class="absmiddle" alt="" />' : ($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['title'] ? '['.$this->cachedLanguageFlag[$mainKey][$sys_language_uid]['title'].']' : '')).'&nbsp;';
        }
 
        /**

diff --git a/t3lib/class.t3lib_transl8tools.php b/t3lib/class.t3lib_transl8tools.php
index af3deb3..27ab49f 100755 (executable)
--- a/t3lib/class.t3lib_transl8tools.php
+++ b/t3lib/class.t3lib_transl8tools.php
@@ -73,7 +73,7 @@ class t3lib_transl8tools      {
                        'uid' => 0,
                        'title' => strlen ($modSharedTSconfig['properties']['defaultLanguageLabel']) ? $modSharedTSconfig['properties']['defaultLanguageLabel'].' ('.$LANG->getLL('defaultLanguage').')' : $LANG->getLL('defaultLanguage'),
                        'ISOcode' => 'DEF',
-                       'flagIcon' => strlen($modSharedTSconfig['properties']['defaultLanguageFlag']) && @is_file($flagAbsPath.$modSharedTSconfig['properties']['defaultLanguageFlag']) ? $flagIconPath.$modSharedTSconfig['properties']['defaultLanguageFlag'] : $flagIconPath.'unknown.gif',
+                       'flagIcon' => strlen($modSharedTSconfig['properties']['defaultLanguageFlag']) && @is_file($flagAbsPath.$modSharedTSconfig['properties']['defaultLanguageFlag']) ? $flagIconPath.$modSharedTSconfig['properties']['defaultLanguageFlag'] : null,
                );
 
                        // Set "All" language: