Merge remote-tracking branch 'Elsensee/ticket/11567' into develop

* Elsensee/ticket/11567:
  [ticket/11567] Renamed extension_manager variable to avoid fatal error
This commit is contained in:
Andreas Fischer 2013-05-26 15:30:32 +02:00
commit 62a751fa65

View file

@ -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/')