Fixed bug #5919: Loss of constraints during upload to TER

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

diff --git a/ChangeLog b/ChangeLog
index 4df00b6..178b129 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2008-02-22  Benjamin Mack  <mack@xnos.org>
 
+       * Fixed bug #7445: Malformed translated locallang causes PHP crash (thanks to Francois Suter)
        * Issue #7307: Bugfixes for "Open Documents" extension - Part 1
          - Changed getSetUpdateSignal() function in t3lib_BEfunc and added hook possibility
          - Used hook for tx_opendocs to be updated when opening & closing a document
@@ -20,10 +21,6 @@
        * fixed bug #7608: Keys for clear-cache labels must be renamed
        * fixed bug #6885: Nested USER_INT, COA_INT, etc. objects are not rendered, credits Oliver Hader
 
-2008-02-22  Benjamin Mack  <mack@xnos.org>
-
-       * Fixed bug #7445: Malformed translated locallang causes PHP crash (thanks to Francois Suter)
-
 2008-02-22  Ingmar Schlecht  <ingmar@typo3.org>
 
        * Added feature #7526: Making loginNews look nicer (Thanks to Steffen Kamper)
@@ -31,6 +28,7 @@
        * Added feature #7337: stdWrap for menu > range & entrylevel (Thanks to Georg Ringer)
        * Fixed bug #7158: DBAL fixes to Indexed Search backend module (Thanks to Moreno Feltscher)
        * Fixed bug #7625: Little typo in stylesheet (Thanks to Steffen Ritter)
+       * Fixed bug #5919: Loss of constraints during upload to TER (Thanks to Malte Jansen)
        * Issue #7508: Slight improvement of BE user label in backend.php (Thanks to Steffen Kamper)
 
 2008-02-21  Benjamin Mack  <mack@xnos.org>

diff --git a/typo3/mod/tools/em/class.em_terconnection.php b/typo3/mod/tools/em/class.em_terconnection.php
index 89d4a2c..53c7385 100644 (file)
--- a/typo3/mod/tools/em/class.em_terconnection.php
+++ b/typo3/mod/tools/em/class.em_terconnection.php
@@ -224,7 +224,7 @@ class SC_mod_tools_em_terconnection {
                if (is_array($extKeysArr)) {
                        foreach ($extKeysArr as $extKey => $version) {
                                if (strlen($extKey)) {
-                                       $dependenciesArr [] = array (
+                                       $dependenciesArr[] = array (
                                                'kind' => 'depends',
                                                'extensionKey' => utf8_encode($extKey),
                                                'versionRange' => utf8_encode($version),
@@ -237,7 +237,7 @@ class SC_mod_tools_em_terconnection {
                if (is_array($extKeysArr)) {
                        foreach ($extKeysArr as $extKey => $version) {
                                if (strlen($extKey)) {
-                                       $dependenciesArr [] = array (
+                                       $dependenciesArr[] = array (
                                                'kind' => 'conflicts',
                                                'extensionKey' => utf8_encode($extKey),
                                                'versionRange' => utf8_encode($version),
@@ -245,7 +245,16 @@ class SC_mod_tools_em_terconnection {
                                }
                        }
                }
-
+               // FIXME: This part must be removed, when the problem is solved on the TER-Server #5919
+               if (count($dependenciesArr) == 1) {
+                       $dependenciesArr[] = array (
+                               'kind' => 'depends',
+                               'extensionKey' => '',
+                               'versionRange' => '',
+                       );
+               }
+               // END for Bug #5919
+               
                        // Compile data for SOAP call:
                $accountData = array(
                        'username' => $em['user']['fe_u'],