5 files changed, 80 insertions, 7 deletions
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index ecd1c43acc..4efc3621e1 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -16,7 +16,7 @@ class acm
 {
 	var $vars = array();
 	var $var_expires = array();
-	var $is_modified = FALSE;
+	var $is_modified = false;
 
 	var $sql_rowset = array();
 
@@ -65,7 +65,7 @@ class acm
 			fclose($fp);
 		}
 
-		$this->is_modified = FALSE;
+		$this->is_modified = false;
 	}
 
 	function tidy()
@@ -80,7 +80,7 @@ class acm
 				continue;
 			}
 
-			$expired = TRUE;
+			$expired = true;
 			include($this->cache_dir . $entry);
 			if ($expired)
 			{
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 06584636f5..d4bc58aa16 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1619,7 +1619,7 @@ function page_header($page_title = '')
 		'T_ICONS_PATH'			=> "{$phpbb_root_path}{$config['icons_path']}/",
 		'T_RANKS_PATH'			=> "{$phpbb_root_path}{$config['ranks_path']}/",
 		'T_UPLOAD_PATH'			=> "{$phpbb_root_path}{$config['upload_path']}/",
-		'T_STYLESHEET_LINK'		=> (!$user->theme['primary']['theme_storedb']) ? "{$phpbb_root_path}styles/" . $user->theme['primary']['theme_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$user->session_id&amp;id=" . $user->theme['primary']['theme_id'],
+		'T_STYLESHEET_LINK'		=> (!$user->theme['primary']['theme_storedb']) ? "{$phpbb_root_path}styles/" . $user->theme['primary']['theme_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$user->session_id&amp;id=" . $user->theme['primary']['style_id'],
 		'T_STYLESHEET_NAME'		=> $user->theme['primary']['theme_name'],
 		'T_THEME_DATA'			=> (!$user->theme['primary']['theme_storedb']) ? '' : $user->theme['primary']['theme_data'])
 	);
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 013fc8a8c8..9668b9f44a 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -9,6 +9,79 @@
 */
 
 /**
+* Recalculate Binary Tree
+*/
+function recalc_btree($sql_id, $sql_table)
+{
+	global $db;
+
+	/* Init table, id's, etc...
+	$sql_id = 'module_id'; // 'forum_id'
+	$sql_table = MODULES_TABLE; // FORUMS_TABLE
+	*/
+
+	if (!$sql_id || !$sql_table)
+	{
+		return;
+	}
+
+	$sql = "SELECT $sql_id, parent_id, left_id, right_id 
+		FROM $sql_table
+		ORDER BY left_id ASC, parent_id ASC, $sql_id ASC";
+	$f_result = $db->sql_query($sql);
+
+	while ($item_data = $db->sql_fetchrow($f_result))
+	{
+		if ($item_data['parent_id'])
+		{
+			$sql = "SELECT left_id, right_id
+				FROM $sql_table
+				WHERE $sql_id = {$item_data['parent_id']}";
+			$result = $db->sql_query($sql);
+
+			if (!$row = $db->sql_fetchrow($result))
+			{
+				$sql = "UPDATE $sql_table SET parent_id = 0 WHERE $sql_id = " . $item_data[$sql_id];
+				$db->sql_query($sql);
+			}
+			$db->sql_freeresult($result);
+
+			$sql = "UPDATE $sql_table
+				SET left_id = left_id + 2, right_id = right_id + 2
+				WHERE left_id > {$row['right_id']}";
+			$db->sql_query($sql);
+
+			$sql = "UPDATE $sql_table
+				SET right_id = right_id + 2
+				WHERE {$row['left_id']} BETWEEN left_id AND right_id";
+			$db->sql_query($sql);
+
+			$item_data['left_id'] = $row['right_id'];
+			$item_data['right_id'] = $row['right_id'] + 1;
+		}
+		else
+		{
+			$sql = "SELECT MAX(right_id) AS right_id
+				FROM $sql_table";
+			$result = $db->sql_query($sql);
+
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			$item_data['left_id'] = $row['right_id'] + 1;
+			$item_data['right_id'] = $row['right_id'] + 2;
+		}
+	
+		$sql = "UPDATE $sql_table
+			SET left_id = {$item_data['left_id']}, right_id = {$item_data['right_id']}
+			WHERE $sql_id = " . $item_data[$sql_id];
+		$db->sql_query($sql);
+	}
+	
+	$db->sql_freeresult($f_result);
+}
+
+/**
 * Simple version of jumpbox, just lists authed forums
 */
 function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true)
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 769f415169..7283a72e37 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1232,7 +1232,7 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
 				'folder_id'	=> PRIVMSGS_NO_BOX,
 				'new'		=> 1,
 				'unread'	=> 1,
-				'forwarded'	=> ($mode == 'forward') ? 1 : 0))
+				'forwarded'	=> ($mode == 'forward') ? 1 : 0
 			);
 		}
 
@@ -1243,7 +1243,7 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
 				case 'mysql':
 				case 'mysql4':
 				case 'mysqli':
-					$db->sql_query('INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('MULTI_INSERT', $sql_ary);
+					$db->sql_query('INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('MULTI_INSERT', $sql_ary));
 				break;
 
 				default:
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 0f6544b9f9..62d100156d 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -842,7 +842,7 @@ class user extends session
 			);
 
 			$db->sql_query('UPDATE ' . STYLES_CSS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE theme_id = ' . $style);
+				WHERE theme_id = ' . $this->theme['primary']['theme_id']);
 
 			unset($sql_ary);
 		}