[Phpbb-checkins] r9983 - /branches/phpBB-3_0_0/phpBB/viewtopic.php

[Henry S. <kel...@ph...>]

Author: Kellanved
Date: Fri Aug 14 16:51:34 2009
New Revision: 9983

Log:
#47795

Modified:
    branches/phpBB-3_0_0/phpBB/viewtopic.php

Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Fri Aug 14 16:51:34 2009
***************
*** 86,91 ****
--- 86,92 ----
  			WHERE topic_id = $topic_id
  				" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND post_approved = 1') . "
  				AND post_time > $topic_last_read
+ 				AND forum_id = $forum_id
  			ORDER BY post_time ASC";
  		$result = $db->sql_query_limit($sql, 1);
  		$row = $db->sql_fetchrow($result);
***************
*** 188,193 ****
--- 189,195 ----
  // The FROM-Order is quite important here, else t.* columns can not be correctly bound.
  if ($post_id)
  {
+ 	$sql_array['SELECT'] .= ', p.post_approved';
  	$sql_array['FROM'][POSTS_TABLE] = 'p';
  }
  
***************
*** 235,241 ****
  }
  else
  {
! 	$sql_array['WHERE'] = "p.post_id = $post_id AND t.topic_id = p.topic_id" . ((!$auth->acl_get('m_approve', $forum_id)) ? ' AND p.post_approved = 1' : '');
  }
  
  $sql_array['WHERE'] .= ' AND (f.forum_id = t.forum_id';
--- 237,243 ----
  }
  else
  {
! 	$sql_array['WHERE'] = "p.post_id = $post_id AND t.topic_id = p.topic_id";
  }
  
  $sql_array['WHERE'] .= ' AND (f.forum_id = t.forum_id';
***************
*** 263,268 ****
--- 265,271 ----
  $topic_data = $db->sql_fetchrow($result);
  $db->sql_freeresult($result);
  
+ // link to unapproved post or incorrect link
  if (!$topic_data)
  {
  	// If post_id was submitted, we try at least to display the topic as a last resort...
***************
*** 274,282 ****
--- 277,299 ----
  	trigger_error('NO_TOPIC');
  }
  
+ $forum_id = (int) $topic_data['forum_id'];
+ $topic_id = (int) $topic_data['topic_id'];
+ 
  // This is for determining where we are (page)
  if ($post_id)
  {
+ 	// are we where we are supposed to be?
+ 	if ($post_id && !$topic_data['post_approved'] && !$auth->acl_get('m_approve', $topic_data['forum_id']))
+ 	{
+ 		// If post_id was submitted, we try at least to display the topic as a last resort...
+ 		if ($post_id && $topic_id)
+ 		{
+ 			redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($forum_id) ? "&f=$forum_id" : '')));
+ 		}
+ 
+ 		trigger_error('NO_TOPIC');
+ 	}
  	if ($post_id == $topic_data['topic_first_post_id'] || $post_id == $topic_data['topic_last_post_id'])
  	{
  		$check_sort = ($post_id == $topic_data['topic_first_post_id']) ? 'd' : 'a';
***************
*** 307,315 ****
  	}
  }
  
- $forum_id = (int) $topic_data['forum_id'];
- $topic_id = (int) $topic_data['topic_id'];
- 
  //
  $topic_replies = ($auth->acl_get('m_approve', $forum_id)) ? $topic_data['topic_replies_real'] : $topic_data['topic_replies'];
  
--- 324,329 ----