Fixed bug #8159: Infinite loop when trying to install extension with constraints...
authorJeff Segars <jsegars@alumni.rice.edu>
Tue, 22 Apr 2008 17:44:19 +0000 (17:44 +0000)
committerJeff Segars <jsegars@alumni.rice.edu>
Tue, 22 Apr 2008 17:44:19 +0000 (17:44 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3611 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/mod/tools/em/class.em_index.php

index bb2bb63..bd45e82 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-22  Jeff Segars  <jeff@webempoweredchurch.org>
+
+       * Fixed bug #8159: Infinite loop when trying to install extension with constraints and configuration
+
 2008-04-22  Ingo Renner  <ingo@typo3.org>
 
        * Fixed bug #8153: [left frame-width] left frame too small for german users, credits Steffen Kamper
index 53bdea9..d37d8bf 100644 (file)
@@ -2001,17 +2001,18 @@ EXTENSION KEYS:
                                                        } else {
                                                                $script = '';
                                                        }
-                                                       $dbUpdates = $this->updatesForm($extKey,$list[$extKey],1,$script,'<input type="hidden" name="_do_install" value="1" /><input type="hidden" name="_clrCmd" value="'.$this->CMD['clrCmd'].'" />');
-                                                       if ($dbUpdates) {
-                                                               $updates = 'Before the extension can be installed the database needs to be updated with new tables or fields. Please select which operations to perform:'.$dbUpdates;
-                                                               if($this->CMD['standAlone']) $updates .= '<input type="hidden" name="standAlone" value="1" />';
-                                                               $depsolver = t3lib_div::_POST('depsolver');
-                                                               if(is_array($depsolver['ignore'])) {
-                                                                       foreach($depsolver['ignore'] as $depK => $depV) {
-                                                                               $updates .= '<input type="hidden" name="depsolver[ignore]['.$depK.']" value="1" />';
-                                                                       }
+                                                       if($this->CMD['standAlone']) {
+                                                               $standaloneUpdates = '<input type="hidden" name="standAlone" value="1" />';
+                                                       }
+                                                       $depsolver = t3lib_div::_POST('depsolver');
+                                                       if(is_array($depsolver['ignore'])) {
+                                                               foreach($depsolver['ignore'] as $depK => $depV) {
+                                                                       $dependencyUpdates .= '<input type="hidden" name="depsolver[ignore]['.$depK.']" value="1" />';
                                                                }
-
+                                                       }
+                                                       $updatesForm = $this->updatesForm($extKey,$list[$extKey],1,$script, $dependencyUpdates.$standaloneUpdates.'<input type="hidden" name="_do_install" value="1" /><input type="hidden" name="_clrCmd" value="'.$this->CMD['clrCmd'].'" />');
+                                                       if ($updatesForm) {
+                                                               $updates = 'Before the extension can be installed the database needs to be updated with new tables or fields. Please select which operations to perform:'.$updatesForm;
                                                                $this->content.=$this->doc->section('Installing '.$this->extensionTitleIconHeader($extKey,$list[$extKey]).strtoupper(': Database needs to be updated'),$updates,1,1,1,1);
                                                        }
                                                } elseif ($this->CMD['remove']) {