From 1e334fca0edeeb519a6d59808c5d82fbc989e6e3 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Wed, 22 Dec 2004 02:06:42 +0000
Subject: [PATCH] Remove version information from display

git-svn-id: file:///svn/phpbb/trunk@5036 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php                        | 10 ++--------
 phpBB/styles/subSilver/template/overall_footer.html |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5ac6f635b7..891c169dc5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -336,7 +336,7 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list
 		ORDER BY left_id ASC';
 	$result = $db->sql_query($sql);
 
-	$right = $cat_right = $padding = 0;
+	$right = $padding = 0;
 	$padding_store = array('0' => 0);
 	$display_jumpbox = false;
 	$iteration = 0;
@@ -388,11 +388,6 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list
 
 		$right = $row['right_id'];
 
-		if ($row['right_id'] - $row['left_id'] > 1)
-		{
-			$cat_right = max($cat_right, $row['right_id']);
-		}
-
 		$template->assign_block_vars('jumpbox_forums', array(
 			'FORUM_ID'		=> $row['forum_id'],
 			'FORUM_NAME'	=> $row['forum_name'],
@@ -1709,7 +1704,7 @@ function page_header($page_title = '')
 		'L_INDEX' 			=> $user->lang['FORUM_INDEX'],
 		'L_ONLINE_EXPLAIN'	=> $l_online_time,
 
-		'U_PRIVATEMSGS'			=> "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=" . (($user->data['user_new_privmsg'] || $l_privmsgs_text_unread) ? 'unread' : 'view_messages'),
+		'U_PRIVATEMSGS'			=> "{$phpbb_root_path}ucp.$phpEx$SID&i=" . (($user->data['user_new_privmsg'] || $l_privmsgs_text_unread) ? 'unread' : 'view_messages'),
 		'U_RETURN_INBOX'		=> "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&folder=inbox",
 		'U_POPUP_PM'			=> "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=popup",
 		'U_MEMBERLIST' 			=> "{$phpbb_root_path}memberlist.$phpEx$SID",
@@ -1797,7 +1792,6 @@ function page_footer()
 	}
 
 	$template->assign_vars(array(
-		'PHPBB_VERSION'	=> $config['version'],
 		'DEBUG_OUTPUT'	=> (defined('DEBUG')) ? $debug_output : '',
 
 		'U_ACP' => ($auth->acl_get('a_') && $user->data['user_id'] != ANONYMOUS) ? "adm/index.$phpEx?sid=" . $user->data['session_id'] : '')
diff --git a/phpBB/styles/subSilver/template/overall_footer.html b/phpBB/styles/subSilver/template/overall_footer.html
index 4298e56968..8762f712d8 100644
--- a/phpBB/styles/subSilver/template/overall_footer.html
+++ b/phpBB/styles/subSilver/template/overall_footer.html
@@ -6,7 +6,7 @@
 	This not only gives respect to the large amount of time given freely by the developers
 	but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain
 	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our 
+	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
 	forums may be affected.
 
 	The phpBB Group : 2003
@@ -16,7 +16,7 @@
 
 <!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
 
-<span class="copyright">Powered by <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a> {PHPBB_VERSION} &copy; 2002, 2003 phpBB Group<br />{TRANSLATION_INFO}<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span>
+<span class="copyright">Powered by <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a> &copy; 2002, 2005 phpBB Group<br />{TRANSLATION_INFO}<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span>
 
 </div>