Skip to content

Commit

Permalink
Merge pull request #6491 from im4bb/ticket/17145
Browse files Browse the repository at this point in the history
Change static to private variable due to php81 inheritance
  • Loading branch information
marc1706 committed Jun 21, 2023
2 parents b613c9f + 464466c commit bf50c63
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions phpBB/phpbb/db/migration/profilefield_base_migration.php
Expand Up @@ -40,6 +40,8 @@ abstract class profilefield_base_migration extends container_aware_migration

protected $user_column_name;

private $profile_row;

public function effectively_installed()
{
return $this->db_tools->sql_column_exists($this->table_prefix . 'profile_fields_data', 'pf_' . $this->profilefield_name);
Expand Down Expand Up @@ -234,15 +236,13 @@ public function convert_user_field_to_custom_field($start)

protected function get_insert_sql_array()
{
static $profile_row;

if ($profile_row === null)
if ($this->profile_row === null)
{
/* @var $manager \phpbb\profilefields\manager */
$manager = $this->container->get('profilefields.manager');
$profile_row = $manager->build_insert_sql_array(array());
$this->profile_row = $manager->build_insert_sql_array(array());
}

return $profile_row;
return $this->profile_row;
}
}

0 comments on commit bf50c63

Please sign in to comment.