diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-01 15:18:53 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-01 15:18:53 -0500 |
| commit | 87b01fc854b22e3839776505486d5a564e671f5f (patch) | |
| tree | f27a612e504bc3e0b1244ea6def6b29a1c3fd146 /phpBB/includes/extension/manager.php | |
| parent | 60e32728393d4258f92f7893f8275889278a995f (diff) | |
| download | forums-87b01fc854b22e3839776505486d5a564e671f5f.tar forums-87b01fc854b22e3839776505486d5a564e671f5f.tar.gz forums-87b01fc854b22e3839776505486d5a564e671f5f.tar.bz2 forums-87b01fc854b22e3839776505486d5a564e671f5f.tar.xz forums-87b01fc854b22e3839776505486d5a564e671f5f.zip | |
[ticket/11415] Make migrator/ext.manager dependencies of the base ext class
PHPBB3-11415
Diffstat (limited to 'phpBB/includes/extension/manager.php')
| -rw-r--r-- | phpBB/includes/extension/manager.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index b42043748f..799c8b2418 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -133,13 +133,15 @@ class phpbb_extension_manager { $extension_class_name = 'phpbb_ext_' . str_replace('/', '_', $name) . '_ext'; + $migrator = $this->container->get('migrator'); + if (class_exists($extension_class_name)) { - return new $extension_class_name($this->container, $name, $this->get_extension_path($name, true)); + return new $extension_class_name($this->container, $this, $migrator, $name, $this->get_extension_path($name, true)); } else { - return new phpbb_extension_base($this->container, $name, $this->get_extension_path($name, true)); + return new phpbb_extension_base($this->container, $this, $migrator, $name, $this->get_extension_path($name, true)); } } |