mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-18 01:08:52 +00:00
[ticket/12786] Some minor fixes of comments and function naming
PHPBB3-12786
This commit is contained in:
parent
18631801d5
commit
ffbd7cf1a7
1 changed files with 22 additions and 14 deletions
36
phpBB/phpbb/db/migration/profilefield_base_migration.php
Normal file → Executable file
36
phpBB/phpbb/db/migration/profilefield_base_migration.php
Normal file → Executable file
|
@ -21,14 +21,15 @@ abstract class profilefield_base_migration extends \phpbb\db\migration\migration
|
||||||
|
|
||||||
protected $profilefield_data;
|
protected $profilefield_data;
|
||||||
|
|
||||||
/*Language data should be in array -> each language_data in seaprte key
|
/**
|
||||||
|
*Language data should be in array -> each language_data in seaprte key
|
||||||
* array(
|
* array(
|
||||||
* '1' => array(
|
* array(
|
||||||
* 'option_id' => value,
|
* 'option_id' => value,
|
||||||
* 'field_type' => value,
|
* 'field_type' => value,
|
||||||
* 'lang_value' => value,
|
* 'lang_value' => value,
|
||||||
* ),
|
* ),
|
||||||
* '2' => array(
|
* array(
|
||||||
* 'option_id' => value,
|
* 'option_id' => value,
|
||||||
* 'field_type' => value,
|
* 'field_type' => value,
|
||||||
* 'lang_value' => value,
|
* 'lang_value' => value,
|
||||||
|
@ -74,6 +75,13 @@ abstract class profilefield_base_migration extends \phpbb\db\migration\migration
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function revert_data()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array('custom', array(array($this, 'delete_custom_profile_field_data'))),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public function create_custom_field()
|
public function create_custom_field()
|
||||||
{
|
{
|
||||||
$sql = 'SELECT MAX(field_order) as max_field_order
|
$sql = 'SELECT MAX(field_order) as max_field_order
|
||||||
|
@ -143,24 +151,21 @@ abstract class profilefield_base_migration extends \phpbb\db\migration\migration
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clean db after purging of extension
|
* Clean db after purging of extension
|
||||||
* function should be called from migration
|
|
||||||
* using revert_data()
|
|
||||||
*/
|
*/
|
||||||
public function clean_cpf_db_entries()
|
public function delete_custom_profile_field_data()
|
||||||
{
|
{
|
||||||
$field_id = $this->get_custom_profile_field_id();
|
$field_id = $this->get_custom_profile_field_id();
|
||||||
|
|
||||||
//Let's clean the field
|
$sql = 'DELETE FROM ' . PROFILE_FIELDS_TABLE . '
|
||||||
//1. PROFILE_FIELDS_TABLE
|
WHERE field_id = ' . $field_id;
|
||||||
$sql = 'DELETE FROM ' . PROFILE_FIELDS_TABLE . ' WHERE field_id = ' . $field_id;
|
|
||||||
$this->db->sql_query($sql);
|
$this->db->sql_query($sql);
|
||||||
|
|
||||||
//2. PPROFILE_LANG_TABLE
|
$sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . '
|
||||||
$sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . ' WHERE field_id = ' . $field_id;
|
WHERE field_id = ' . $field_id;
|
||||||
$this->db->sql_query($sql);
|
$this->db->sql_query($sql);
|
||||||
|
|
||||||
//3. PROFILE_FIELDS_LANG_TABLE
|
$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . '
|
||||||
$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . ' WHERE field_id = ' . $field_id;
|
WHERE field_id = ' . $field_id;
|
||||||
$this->db->sql_query($sql);
|
$this->db->sql_query($sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -170,9 +175,12 @@ abstract class profilefield_base_migration extends \phpbb\db\migration\migration
|
||||||
*/
|
*/
|
||||||
public function get_custom_profile_field_id()
|
public function get_custom_profile_field_id()
|
||||||
{
|
{
|
||||||
$sql = 'SELECT field_id FROM ' . PROFILE_FIELDS_TABLE . ' WHERE field_name = \'' . $this->profilefield_name . '\'';
|
$sql = "SELECT field_id
|
||||||
|
FROM " . PROFILE_FIELDS_TABLE . "
|
||||||
|
WHERE field_name = '" . $this->profilefield_name . "'";
|
||||||
$result = $this->db->sql_query($sql);
|
$result = $this->db->sql_query($sql);
|
||||||
$field_id = (int) $this->db->sql_fetchfield('field_id');
|
$field_id = (int) $this->db->sql_fetchfield('field_id');
|
||||||
|
$this->db->sql_freeresult($result);
|
||||||
|
|
||||||
return $field_id;
|
return $field_id;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue