3 files changed, 31 insertions, 29 deletions
diff --git a/phpBB/phpbb/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php
index 171dae4d14..9aaee9e468 100644
--- a/phpBB/phpbb/tree/nestedset.php
+++ b/phpBB/phpbb/tree/nestedset.php
@@ -9,17 +9,9 @@
 
 namespace phpbb\tree;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 abstract class nestedset implements \phpbb\tree\tree_interface
 {
-	/** @var \phpbb\db\driver\driver */
+	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 
 	/** @var \phpbb\lock\db */
@@ -60,7 +52,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
 	/**
 	* Construct
 	*
-	* @param \phpbb\db\driver\driver	$db		Database connection
+	* @param \phpbb\db\driver\driver_interface	$db		Database connection
 	* @param \phpbb\lock\db		$lock	Lock class used to lock the table when moving forums around
 	* @param string			$table_name			Table name
 	* @param string			$message_prefix		Prefix for the messages thrown by exceptions
@@ -68,7 +60,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
 	* @param array			$item_basic_data	Array with basic item data that is stored in item_parents
 	* @param array			$columns			Array with column names to overwrite
 	*/
-	public function __construct(\phpbb\db\driver\driver $db, \phpbb\lock\db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array())
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array())
 	{
 		$this->db = $db;
 		$this->lock = $lock;
@@ -672,6 +664,32 @@ abstract class nestedset implements \phpbb\tree\tree_interface
 	}
 
 	/**
+	* Get all items from the tree
+	*
+	* @param bool		$order_asc		Order the items ascending by their left_id
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_all_tree_data($order_asc = true)
+	{
+		$rows = array();
+
+		$sql = 'SELECT *
+			FROM ' . $this->table_name . ' ' .
+			$this->get_sql_where('WHERE') . '
+			ORDER BY ' . $this->column_left_id . ' ' . ($order_asc ? 'ASC' : 'DESC');
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$rows[(int) $row[$this->column_item_id]] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $rows;
+	}
+
+	/**
 	* Remove a subset from the nested set
 	*
 	* @param array	$subset_items		Subset of items to remove
diff --git a/phpBB/phpbb/tree/nestedset_forum.php b/phpBB/phpbb/tree/nestedset_forum.php
index 2fee5b097e..5973b0b6d9 100644
--- a/phpBB/phpbb/tree/nestedset_forum.php
+++ b/phpBB/phpbb/tree/nestedset_forum.php
@@ -9,24 +9,16 @@
 
 namespace phpbb\tree;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 class nestedset_forum extends \phpbb\tree\nestedset
 {
 	/**
 	* Construct
 	*
-	* @param \phpbb\db\driver\driver	$db		Database connection
+	* @param \phpbb\db\driver\driver_interface	$db		Database connection
 	* @param \phpbb\lock\db		$lock	Lock class used to lock the table when moving forums around
 	* @param string				$table_name		Table name
 	*/
-	public function __construct(\phpbb\db\driver\driver $db, \phpbb\lock\db $lock, $table_name)
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name)
 	{
 		parent::__construct(
 			$db,
diff --git a/phpBB/phpbb/tree/tree_interface.php b/phpBB/phpbb/tree/tree_interface.php
index 162c1e5e29..90ec27e024 100644
--- a/phpBB/phpbb/tree/tree_interface.php
+++ b/phpBB/phpbb/tree/tree_interface.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\tree;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 interface tree_interface
 {
 	/**