Re-use the Database connection

core/upgrade/index.php

@@ -43,6 +43,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -403,7 +406,6 @@
 		echo 		"<input type='checkbox' name='action[menu_defaults]' id='do_menu' value='1' onclick=\"event.stopPropagation(); $('#sel_menu').fadeToggle('fast');\">";
 		echo 		"<select name='sel_menu' id='sel_menu' class='formfld' style='display: none; vertical-align: middle; margin-left: 5px;' onclick=\"event.stopPropagation();\">";
 		$sql = "select * from v_menus order by menu_name asc;";
-		$database = new database;
 		$result = $database->select($sql, null, 'all');
 		if (is_array($result) && sizeof($result) != 0) {
 			foreach ($result as $row) {

core/upgrade/upgrade.php

@@ -204,12 +204,13 @@
 
 //restore the default menu
 	if ($upgrade_type == 'menus') {
+		//connect to the database
+		$database = new database;
 
 		//get the menu uuid and language
 		$sql = "select menu_uuid, menu_language from v_menus ";
 		$sql .= "where menu_name = :menu_name ";
 		$parameters['menu_name'] = 'default';
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && sizeof($row) != 0) {
 			$menu_uuid = $row["menu_uuid"];