From d9d866b91f6da3ccd491dad93d0675d3fd186f2e Mon Sep 17 00:00:00 2001
From: Jeff Segars <jsegars@alumni.rice.edu>
Date: Tue, 22 Apr 2008 17:44:19 +0000
Subject: [PATCH] Fixed bug #8159: Infinite loop when trying to install
 extension with constraints and configuration

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3611 709f56b5-9817-0410-a4d7-c38de5d9e867
---
 ChangeLog                             |  4 ++++
 typo3/mod/tools/em/class.em_index.php | 21 +++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb2bb6376fe0..bd45e828bf39 100755
--- 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
diff --git a/typo3/mod/tools/em/class.em_index.php b/typo3/mod/tools/em/class.em_index.php
index 53bdea949056..d37d8bfaab13 100644
--- a/typo3/mod/tools/em/class.em_index.php
+++ b/typo3/mod/tools/em/class.em_index.php
@@ -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']) {
-- 
2.20.1