mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-11 01:55:24 +02:00
Code Issues Releases Wiki Activity

[ticket/11495] Remove useless release_lock() method

Browse Source 
PHPBB3-11495
This commit is contained in:
Joas Schilling 2013-04-30 16:19:25 +02:00
parent 78b0d3e723
commit 6055a3cc7e
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
phpBB/includes/tree/nestedset.php
View File

@ -121,16 +121,6 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
return true; return true;
} }
/**
* Releases the lock on the item table
*
* @return null
*/
protected function release_lock()
{
$this->lock->release();
}
/** /**
* @inheritdoc * @inheritdoc
*/ */
@ -239,7 +229,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
if (!$item) if (!$item)
{ {
$this->release_lock(); $this->lock->release();
throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
} }
@ -275,7 +265,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
if (!$target) if (!$target)
{ {
$this->release_lock(); $this->lock->release();
// The item is already on top or bottom // The item is already on top or bottom
return false; return false;
} }
@ -327,7 +317,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
" . $this->get_sql_where(); " . $this->get_sql_where();
$this->db->sql_query($sql); $this->db->sql_query($sql);
$this->release_lock(); $this->lock->release();
return true; return true;
} }
@ -371,7 +361,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
$item_data = $this->get_subtree_data($current_parent_id); $item_data = $this->get_subtree_data($current_parent_id);
if (!isset($item_data[$current_parent_id])) if (!isset($item_data[$current_parent_id]))
{ {
$this->release_lock(); $this->lock->release();
throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
} }
@ -381,13 +371,13 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1) if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1)
{ {
$this->release_lock(); $this->lock->release();
return false; return false;
} }
if (in_array($new_parent_id, $move_items)) if (in_array($new_parent_id, $move_items))
{ {
$this->release_lock(); $this->lock->release();
throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
} }
@ -411,7 +401,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
if (!$new_parent) if (!$new_parent)
{ {
$this->db->sql_transaction('rollback'); $this->db->sql_transaction('rollback');
$this->release_lock(); $this->lock->release();
throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
} }
@ -449,7 +439,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
$this->db->sql_query($sql); $this->db->sql_query($sql);
$this->db->sql_transaction('commit'); $this->db->sql_transaction('commit');
$this->release_lock(); $this->lock->release();
return true; return true;
} }
@ -477,7 +467,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
$item_data = $this->get_subtree_data($item_id); $item_data = $this->get_subtree_data($item_id);
if (!isset($item_data[$item_id])) if (!isset($item_data[$item_id]))
{ {
$this->release_lock(); $this->lock->release();
throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM'); throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
} }
@ -486,7 +476,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
if (in_array($new_parent_id, $move_items)) if (in_array($new_parent_id, $move_items))
{ {
$this->release_lock(); $this->lock->release();
throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
} }
@ -510,7 +500,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
if (!$new_parent) if (!$new_parent)
{ {
$this->db->sql_transaction('rollback'); $this->db->sql_transaction('rollback');
$this->release_lock(); $this->lock->release();
throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT'); throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
} }
@ -548,7 +538,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
$this->db->sql_query($sql); $this->db->sql_query($sql);
$this->db->sql_transaction('commit'); $this->db->sql_transaction('commit');
$this->release_lock(); $this->lock->release();
return true; return true;
} }
@ -710,7 +700,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
if ($acquired_new_lock) if ($acquired_new_lock)
{ {
$this->release_lock(); $this->lock->release();
} }
} }
@ -838,7 +828,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
if ($acquired_new_lock) if ($acquired_new_lock)
{ {
$this->db->sql_transaction('commit'); $this->db->sql_transaction('commit');
$this->release_lock(); $this->lock->release();
} }
return $new_id; return $new_id;