aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-05-26 15:30:32 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-05-26 15:30:32 +0200
commit62a751fa65753fa40057b1f816eb1fae894a25af (patch)
tree275eeb5a1839fc636d984821f7dd0d79c83253b5
parent64e2230d1915b56738789b929248edf9812221ff (diff)
parentbb67b079207703568e69bd9d38e8dbe3f33287fc (diff)
downloadforums-62a751fa65753fa40057b1f816eb1fae894a25af.tar
forums-62a751fa65753fa40057b1f816eb1fae894a25af.tar.gz
forums-62a751fa65753fa40057b1f816eb1fae894a25af.tar.bz2
forums-62a751fa65753fa40057b1f816eb1fae894a25af.tar.xz
forums-62a751fa65753fa40057b1f816eb1fae894a25af.zip
Merge remote-tracking branch 'Elsensee/ticket/11567' into develop
* Elsensee/ticket/11567: [ticket/11567] Renamed extension_manager variable to avoid fatal error
-rw-r--r--phpBB/install/database_update.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5ea950bfad..6637736bf2 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -213,8 +213,8 @@ if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
}
$migrator = $phpbb_container->get('migrator');
-$extension_manager = $phpbb_container->get('ext.manager');
-$finder = $extension_manager->get_finder();
+$phpbb_extension_manager = $phpbb_container->get('ext.manager');
+$finder = $phpbb_extension_manager->get_finder();
$migrations = $finder
->core_path('includes/db/migration/data/')