mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-14 19:45:21 +02:00
Code Issues Releases Wiki Activity

[ticket/11495] Move nestedset default values to new method

Browse Source 
PHPBB3-11495
This commit is contained in:
Joas Schilling 2013-04-18 00:50:30 +02:00
parent e0393a3062
commit 514bcb2fac
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
phpBB/includes/nestedset/base.php
View File

@ -67,14 +67,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
*/ */
public function insert(array $additional_data) public function insert(array $additional_data)
{ {
$item_data = array_merge($additional_data, array( $item_data = $this->reset_nestedset_values($additional_data);
$this->column_parent_id => 0,
$this->column_left_id => 0,
$this->column_right_id => 0,
$this->column_item_parents => '',
));
unset($item_data[$this->column_item_id]);
$sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $item_data); $sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $item_data);
$this->db->sql_query($sql); $this->db->sql_query($sql);
@ -564,6 +557,26 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
return $new_parent[$this->column_right_id] + $diff; return $new_parent[$this->column_right_id] + $diff;
} }
/**
* Resets values required for the nested set system
*
* @param array $item Original item data
* @return array Original item data + nested set defaults
*/
protected function reset_nestedset_values(array $item)
{
$item_data = array_merge($item, array(
$this->column_parent_id => 0,
$this->column_left_id => 0,
$this->column_right_id => 0,
$this->column_item_parents => '',
));
unset($item_data[$this->column_item_id]);
return $item_data;
}
/** /**
* @inheritdoc * @inheritdoc
*/ */