2 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index f96fcb9568..ee916aedc0 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -52,12 +52,13 @@ class phpbb_db_migration
 	}
 
 	/**
-	* Updates the database schema
+	* Updates the database schema by providing a set of change instructions
 	*
-	* @return null
+	* @return array
 	*/
 	function update_schema()
 	{
+		return array();
 	}
 
 	/**
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index f4613e3aec..4a178af468 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -151,7 +151,7 @@ class phpbb_db_migrator
 
 		if (!$state['migration_schema_done'])
 		{
-			$migration->update_schema();
+			$this->apply_schema_changes($migration->update_schema());
 			$state['migration_schema_done'] = true;
 		}
 		else
@@ -245,4 +245,9 @@ class phpbb_db_migrator
 
 		return true;
 	}
+
+	function apply_schema_changes($schema_changes)
+	{
+		$this->db_tools->perform_schema_changes($schema_changes);
+	}
 }