From b334a2ce0fe3ae196da9686028667c430eb411d1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 17:04:37 +0200
Subject: [ticket/11495] Move classes to tree/ as they all implement a tree

PHPBB3-11495
---
 phpBB/includes/tree/nestedset_forum.php | 52 +++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 phpBB/includes/tree/nestedset_forum.php

(limited to 'phpBB/includes/tree/nestedset_forum.php')

diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
new file mode 100644
index 0000000000..0a66e68915
--- /dev/null
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package Tree - Nested Set Forum
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
+{
+	/**
+	* Column names in the table
+	* @var string
+	*/
+	protected $column_item_id = 'forum_id';
+	protected $column_item_parents = 'forum_parents';
+
+	/**
+	* Prefix for the language keys returned by exceptions
+	* @var string
+	*/
+	protected $message_prefix = 'FORUM_NESTEDSET_';
+
+	/**
+	* List of item properties to be cached in $item_parents
+	* @var array
+	*/
+	protected $item_basic_data = array('forum_id', 'forum_name', 'forum_type');
+
+	/**
+	* Construct
+	*
+	* @param phpbb_db_driver	$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 $db, phpbb_lock_db $lock, $table_name)
+	{
+		$this->db = $db;
+		$this->lock = $lock;
+		$this->table_name = $table_name;
+	}
+}
-- 
cgit v1.2.1


From 0def8b7d9cb06cd2abf462f18f1404fc119861bd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 18:09:21 +0200
Subject: [ticket/11495] Use constructor arguments over properties in
 implementation

PHPBB3-11495
---
 phpBB/includes/tree/nestedset_forum.php | 38 ++++++++++++++-------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes/tree/nestedset_forum.php')

diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
index 0a66e68915..7dcb12331c 100644
--- a/phpBB/includes/tree/nestedset_forum.php
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -17,25 +17,6 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
 {
-	/**
-	* Column names in the table
-	* @var string
-	*/
-	protected $column_item_id = 'forum_id';
-	protected $column_item_parents = 'forum_parents';
-
-	/**
-	* Prefix for the language keys returned by exceptions
-	* @var string
-	*/
-	protected $message_prefix = 'FORUM_NESTEDSET_';
-
-	/**
-	* List of item properties to be cached in $item_parents
-	* @var array
-	*/
-	protected $item_basic_data = array('forum_id', 'forum_name', 'forum_type');
-
 	/**
 	* Construct
 	*
@@ -45,8 +26,21 @@ class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
 	*/
 	public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name)
 	{
-		$this->db = $db;
-		$this->lock = $lock;
-		$this->table_name = $table_name;
+		parent::__construct(
+			$db,
+			$lock,
+			$table_name,
+			'FORUM_NESTEDSET_',
+			'',
+			array(
+				'forum_id',
+				'forum_name',
+				'forum_type',
+			),
+			array(
+				'item_id'		=> 'forum_id',
+				'item_parents'	=> 'forum_parents',
+			)
+		);
 	}
 }
-- 
cgit v1.2.1


From baff4287e5a7142b7af41e56c29b064bb56fd7fb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 22:39:24 +0200
Subject: [ticket/11495] Fix comments and package docs

PHPBB3-11495
---
 phpBB/includes/tree/nestedset_forum.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/tree/nestedset_forum.php')

diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
index 7dcb12331c..06ef37e971 100644
--- a/phpBB/includes/tree/nestedset_forum.php
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Tree - Nested Set Forum
+* @package tree - nestedset forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
-- 
cgit v1.2.1


From 863d0c7687cc926dfda0ddd20b34e7942748fb2e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 14:36:26 +0200
Subject: [ticket/11495] Fix some more comments and the package tag

PHPBB3-11495
---
 phpBB/includes/tree/nestedset_forum.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/tree/nestedset_forum.php')

diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
index 06ef37e971..ff09ef55d0 100644
--- a/phpBB/includes/tree/nestedset_forum.php
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
-- 
cgit v1.2.1