diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-20 23:32:36 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-20 23:32:36 +0100 |
| commit | b566686b5161e699f8376b0463960a9ffb3812b6 (patch) | |
| tree | 9392b221794a7bac17102b20f64f33fa009c31c2 /phpBB/phpbb/db/migration/profilefield_base_migration.php | |
| parent | c71e8ffb29e0b3774395b9fbfa3b3faff0095413 (diff) | |
| parent | a5fae1b1f09358f8a24ff32fc5192395cd314244 (diff) | |
| download | forums-b566686b5161e699f8376b0463960a9ffb3812b6.tar forums-b566686b5161e699f8376b0463960a9ffb3812b6.tar.gz forums-b566686b5161e699f8376b0463960a9ffb3812b6.tar.bz2 forums-b566686b5161e699f8376b0463960a9ffb3812b6.tar.xz forums-b566686b5161e699f8376b0463960a9ffb3812b6.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
phpBB/phpbb/db/migration/profilefield_base_migration.php
phpBB/phpbb/db/migrator.php
Diffstat (limited to 'phpBB/phpbb/db/migration/profilefield_base_migration.php')
| -rw-r--r-- | phpBB/phpbb/db/migration/profilefield_base_migration.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/phpbb/db/migration/profilefield_base_migration.php b/phpBB/phpbb/db/migration/profilefield_base_migration.php index bc3d2e9ee5..3f26a4998c 100644 --- a/phpBB/phpbb/db/migration/profilefield_base_migration.php +++ b/phpBB/phpbb/db/migration/profilefield_base_migration.php @@ -13,7 +13,7 @@ namespace phpbb\db\migration; -abstract class profilefield_base_migration extends \phpbb\db\migration\migration +abstract class profilefield_base_migration extends container_aware_migration { protected $profilefield_name; @@ -237,10 +237,8 @@ abstract class profilefield_base_migration extends \phpbb\db\migration\migration if ($profile_row === null) { - global $phpbb_container; - /* @var $manager \phpbb\profilefields\manager */ - $manager = $phpbb_container->get('profilefields.manager'); + $manager = $this->container->get('profilefields.manager'); $profile_row = $manager->build_insert_sql_array(array()); } |