Bläddra i källkod

Fixed step 7 installation label bug - fixes #1762

Bryan Fuertes 13 år sedan
förälder
incheckning
5f71d86e95
2 ändrade filer med 9 tillägg och 10 borttagningar
  1. 9 9
      main/install/index.php
  2. 0 1
      main/install/install.lib.php

+ 9 - 9
main/install/index.php

@@ -799,21 +799,21 @@ if ($_POST['step2']) {
 
 		include 'install_db.inc.php';
 		include 'install_files.inc.php';
-	}
-
-	display_after_install_message($installType, $nbr_courses);
+        }
+        $current_step = 7;
+        display_after_install_message($installType, $nbr_courses);
 
 } elseif ($_POST['step1'] || $badUpdatePath) {
 
-	//STEP 1 : REQUIREMENTS
-	//make sure that proposed path is set, shouldn't be necessary but...
-	if (empty($proposedUpdatePath)) { $proposedUpdatePath = $_POST['updatePath']; }
-	display_requirements($installType, $badUpdatePath, $proposedUpdatePath, $update_from_version_8, $update_from_version_6);
+        //STEP 1 : REQUIREMENTS
+        //make sure that proposed path is set, shouldn't be necessary but...
+        if (empty($proposedUpdatePath)) { $proposedUpdatePath = $_POST['updatePath']; }
+        display_requirements($installType, $badUpdatePath, $proposedUpdatePath, $update_from_version_8, $update_from_version_6);
 
 } else {
 
-	// This is the start screen.
-	display_language_selection();
+        // This is the start screen.
+        display_language_selection();
 }
 ?>
   </td>

+ 0 - 1
main/install/install.lib.php

@@ -948,7 +948,6 @@ function step_active($param) {
  */
 function display_step_sequence() {
     global $current_step;
-    global $total_steps;
     return get_lang('Step'.$current_step).' &ndash; ';
 }