Move update_indexes into the schema method

core/upgrade/index.php

@@ -152,9 +152,6 @@
 			$obj = new schema(['database' => $database]);
 			$_SESSION["response"]["schema"] = $obj->schema("html");
 			message::add($text['message-upgrade_schema'], null, $message_timeout);
-
-			//update database foreign key indexes
-			$database->update_indexes();
 		}
 
 		//process the apps defaults

core/upgrade/upgrade.php

@@ -235,9 +235,6 @@
 				echo "        ".trim($row)."\n";
 			}
 		}
-
-		//update database foreign key indexes
-		$database->update_indexes();
 	}
 
 

core/upgrade/upgrade_menu.php

@@ -353,9 +353,6 @@ function do_upgrade_schema() {
 	//get the database schema put it into an array then compare and update the database as needed.
 	$obj = new schema();
 	echo $obj->schema('text');
-
-	//update the database foreign key indexes
-	$database->update_indexes();
 }
 
 /**

resources/classes/schema.php

@@ -649,6 +649,9 @@ class schema {
 		//create views so that alter table statements complete
 		$this->database->views('create');
 
+		//update database foreign key indexes
+		$this->database->update_indexes();
+
 		//handle response
 		return $response;