From f9a451cce21686c19e0c725efc2edbfadabc4d3a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 1 Mar 2006 21:48:02 +0000
Subject: - some bugfixes - committed coding guidelines as they are at area51 -
 removed script_path (needs a close inspection later) - removed the need for
 server_name and server_port - able to define server port/name/protocol and
 force the user-defined server vars (very handy for proxy setups)

git-svn-id: file:///svn/phpbb/trunk@5595 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/mcp/mcp_front.php | 2 ++
 phpBB/includes/mcp/mcp_queue.php | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/mcp')

diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 64982141a4..6c2c4df406 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -60,6 +60,7 @@ function mcp_front_view($id, $mode, $action)
 			{
 				$post_list[] = $row['post_id'];
 			}
+			$db->sql_freeresult($result);
 
 			$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.username, t.topic_id, t.topic_title, t.topic_first_post_id, p.forum_id
 				FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t,  ' . USERS_TABLE . ' u
@@ -86,6 +87,7 @@ function mcp_front_view($id, $mode, $action)
 					'POST_TIME'		=> $user->format_date($row['post_time']))
 				);
 			}
+			$db->sql_freeresult($result);
 		}
 
 		if ($total == 0)
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 80d3672427..7884298380 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -495,7 +495,7 @@ function approve_post($post_id_list, $mode)
 		confirm_box(false, 'APPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 	}
 
-	$redirect = request_var('redirect', "{$phpbb_root_path}index.$phpEx$SID");
+	$redirect = request_var('redirect', "index.$phpEx$SID");
 
 	if (strpos($redirect, '?') === false)
 	{
@@ -509,7 +509,7 @@ function approve_post($post_id_list, $mode)
 	else
 	{
 		meta_refresh(3, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], "<a href=\"{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=" . $forum_id . '">', '</a>'));
+		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $phpbb_root_path . $redirect . '">', '</a>') . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], "<a href=\"{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=" . $forum_id . '">', '</a>'));
 	}
 }
 
@@ -715,7 +715,7 @@ function disapprove_post($post_id_list, $mode)
 		confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 	}
 
-	$redirect = request_var('redirect', "{$phpbb_root_path}index.$phpEx$SID");
+	$redirect = request_var('redirect', "index.$phpEx$SID");
 
 	if (strpos($redirect, '?') === false)
 	{
-- 
cgit v1.2.1