diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 14:15:59 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 14:15:59 -0600 |
| commit | a6f877c0d84ff102d3812246eae7469e191983e2 (patch) | |
| tree | be1cdff6c816abba3350d129c2d726aef33b5c14 /phpBB/includes/db | |
| parent | 024c21f30d9873aa21d275ab85a6d662d9024089 (diff) | |
| download | forums-a6f877c0d84ff102d3812246eae7469e191983e2.tar forums-a6f877c0d84ff102d3812246eae7469e191983e2.tar.gz forums-a6f877c0d84ff102d3812246eae7469e191983e2.tar.bz2 forums-a6f877c0d84ff102d3812246eae7469e191983e2.tar.xz forums-a6f877c0d84ff102d3812246eae7469e191983e2.zip | |
[ticket/11386] Fix circular reference error & serialize error
PHPBB3-11386
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/migrator.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php index 855e640554..de9c06948c 100644 --- a/phpBB/includes/db/migrator.php +++ b/phpBB/includes/db/migrator.php @@ -72,12 +72,11 @@ class phpbb_db_migrator /** * Constructor of the database migrator */ - public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, phpbb_extension_manager $extension_manager, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools) + public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools) { $this->config = $config; $this->db = $db; $this->db_tools = $db_tools; - $this->extension_manager = $extension_manager; $this->migrations_table = $migrations_table; @@ -95,6 +94,16 @@ class phpbb_db_migrator } /** + * Set Extension Manager (required) + * + * Not in constructor to prevent circular reference error + */ + public function set_extension_manager(phpbb_extension_manager $extension_manager) + { + $this->extension_manager = $extension_manager; + } + + /** * Loads all migrations and their application state from the database. * * @return null |