mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6491 from im4bb/ticket/17145

Browse Source 
Change static to private variable due to php81 inheritance
This commit is contained in:
Marc Alexander
2023-06-21 20:35:54 +02:00
parent b613c9f63d 464466cade
commit bf50c63d6e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,8 @@ abstract class profilefield_base_migration extends container_aware_migration
protected $user_column_name; protected $user_column_name;
private $profile_row;
public function effectively_installed() public function effectively_installed()
{ {
return $this->db_tools->sql_column_exists($this->table_prefix . 'profile_fields_data', 'pf_' . $this->profilefield_name); return $this->db_tools->sql_column_exists($this->table_prefix . 'profile_fields_data', 'pf_' . $this->profilefield_name);
@@ -234,15 +236,13 @@ abstract class profilefield_base_migration extends container_aware_migration
protected function get_insert_sql_array() protected function get_insert_sql_array()
{ {
static $profile_row; if ($this->profile_row === null)
if ($profile_row === null)
{ {
/* @var $manager \phpbb\profilefields\manager */ /* @var $manager \phpbb\profilefields\manager */
$manager = $this->container->get('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;
} }
} }