From 2147b080333fbcddb5860ea7ece68b2ba0ef3195 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Tue, 15 Jul 2014 17:11:13 +0000
Subject: [PATCH] Make upgrade.php use the schema and domain upgrade classes

---
 core/upgrade/upgrade.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php
index e10d2f8ecd..f8d530f28c 100644
--- a/core/upgrade/upgrade.php
+++ b/core/upgrade/upgrade.php
@@ -78,8 +78,17 @@ if ($response_format == 'text') {
 	echo $text['label-database']."\n";
 }
 
-//upgrade the database schema
-	require_once "core/upgrade/upgrade_schema.php";
+//make sure the database schema and installation have performed all necessary tasks
+	$display_results = false;
+	$display_type = 'none';
+	require_once "resources/classes/schema.php";
+	$obj = new schema;
+	$obj->schema($db, $db_type, $db_name, $display_type);
+
+//run all app_defaults.php files
+	require_once "resources/classes/domains.php";
+	$domain = new domains;
+	$domain->upgrade();
 
 //show the content
 	if ($response_format == 'html') {