Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change static to private variable due to php81 inheritance #6491

Merged
merged 1 commit into from Jun 21, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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;
}
}