mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-28 10:40:28 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
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
This commit is contained in:
Joas Schilling
2015-01-20 23:32:36 +01:00
parent c71e8ffb29 a5fae1b1f0
commit b566686b51
12 changed files with 156 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/db/migration/profilefield_base_migration.php
View File

@@ -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());
}