From 99fcfdbb32fdd3a885d6fa27df3628119dfbfe7d Mon Sep 17 00:00:00 2001
From: James Atkinson <thefinn@users.sourceforge.net>
Date: Fri, 6 Jul 2001 23:50:58 +0000
Subject: [PATCH] More updates

git-svn-id: file:///svn/phpbb/trunk@593 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/modcp.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index 9e95544e7b..ebbad6badd 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************  
- *                                 
+ *                                modcp.php 
  *                            -------------------                         
  *   begin                : July 4, 2001
  *   copyright            : (C) 2001 The phpBB Group        
@@ -41,9 +41,9 @@ $page_title = "Modertator Control Panel";
 $forum_id = ($HTTP_POST_VARS[POST_FORUM_URL]) ? $HTTP_POST_VARS[POST_FORUM_URL] : $HTTP_GET_VARS[POST_FORUM_URL];
 $topic_id = ($HTTP_POST_VARS[POST_TOPIC_URL]) ? $HTTP_POST_VARS[POST_TOPIC_URL] : $HTTP_GET_VARS[POST_TOPIC_URL];
 
-if(empty($forum_id))
+if(empty($forum_id) || !isset($forum_id))
 {
-	$sql = "SELECT forum_id, forum_topics FROM ".TOPICS_TABLE." WHERE topic_id = ".$topic_id;
+	$sql = "SELECT f.forum_id, f.forum_topics FROM ".TOPICS_TABLE." t, ".FORUMS_TABLE." f WHERE t.topic_id = ".$topic_id." AND f.forum_id = t.forum_id";
 	if(!$result = $db->sql_query($sql))
 	{
 		message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist'], "", __LINE__, __FILE__, $sql);
@@ -216,7 +216,10 @@ switch($mode)
 			message_die(GENERAL_MESSAGE, $msg);
 			
 		}
-
+		else
+		{
+			echo "Here";
+		}
 	
 	break;
 	case 'move':