From 8c52310a094feaad5654cb58415570e47f9ba85d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 3 Aug 2011 12:13:20 +0200
Subject: [PATCH] Minor when migrating from 1.8.7 to 1.8.8.4 see #3571

---
 main/install/index.php       | 22 +++++++++++++---------
 main/install/install.lib.php |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/main/install/index.php b/main/install/index.php
index 2b086744ac..40479689d2 100755
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -637,16 +637,20 @@ if ($_POST['step2']) {
 	<?php if ($installType == 'new') echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)'; ?><br />
 	<?php
 	if (!$singleDbForm) {
-		/*echo get_lang('StatDB').' : <strong>'.$dbStatsForm.'</strong>';
-		if ($installType == 'new') {
-			echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)';
-		}
-		echo '<br />';
-		echo get_lang('UserDB').' : <strong>'.$dbUserForm.'</strong>';
-		if ($installType == 'new') {
-			echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)';
+		//Showing this data only in case a user migrates from a 3 main databases (main, user, tracking)
+		//@todo should be removed
+		if ($installType == 'update') {
+			echo get_lang('StatDB').' : <strong>'.$dbStatsForm.'</strong>';
+			if ($installType == 'new') {
+				echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)';
+			}
+			echo '<br />';
+			echo get_lang('UserDB').' : <strong>'.$dbUserForm.'</strong>';
+			if ($installType == 'new') {
+				echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)';
+			}
+			echo '<br />';
 		}
-		echo '<br />';*/
 	}
 	?>
 	<?php //echo get_lang('EnableTracking').' : '.($enableTrackingForm ? get_lang('Yes') : get_lang('No')); ?>
diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index 855ed854fe..a423ccd74b 100755
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -1694,7 +1694,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
     display_database_parameter($installType, get_lang('MainDB'), 'dbNameForm',  $dbNameForm,  '&nbsp;', null, 'id="optional_param1" '.$style);
     
     //Only for updates we show this options
-    if ($install_type == INSTALL_TYPE_UPDATE) {    
+    if ($installType == INSTALL_TYPE_UPDATE) {    
     	display_database_parameter($installType, get_lang('StatDB'), 'dbStatsForm', $dbStatsForm, '&nbsp;', null, 'id="optional_param2" '.$style);    
     
 	    if ($installType == INSTALL_TYPE_UPDATE && in_array($_POST['old_version'], $update_from_version_6)) {