[Phpbb-checkins] r10172 - /branches/phpBB-3_0_0/phpBB/includes/functions.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Sun Sep 20 19:50:35 2009
New Revision: 10172

Log:
remove unnecessary query parts... thanks to asinshesq for pointing it out.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Sun Sep 20 19:50:35 2009
***************
*** 1693,1703 ****
  			'LEFT_JOIN'		=> array(
  				array(
  					'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
! 					'ON'	=> "tt.user_id = $user_id AND t.topic_id = tt.topic_id AND tt.mark_time > $last_mark",
  				),
  				array(
  					'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
! 					'ON'	=> "ft.user_id = $user_id AND t.forum_id = ft.forum_id AND ft.mark_time > $last_mark",
  				),
  			),
  
--- 1693,1703 ----
  			'LEFT_JOIN'		=> array(
  				array(
  					'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
! 					'ON'	=> "tt.user_id = $user_id AND t.topic_id = tt.topic_id",
  				),
  				array(
  					'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
! 					'ON'	=> "ft.user_id = $user_id AND t.forum_id = ft.forum_id",
  				),
  			),
  
***************
*** 1705,1714 ****
  				(
  				(tt.mark_time IS NOT NULL AND t.topic_last_post_time > tt.mark_time) OR
  				(tt.mark_time IS NULL AND ft.mark_time IS NOT NULL AND t.topic_last_post_time > ft.mark_time) OR
! 					(
! 						((tt.mark_time IS NULL AND ft.mark_time IS NULL) OR (tt.mark_time < $last_mark AND ft.mark_time < $last_mark))
! 						AND t.topic_last_post_time > $last_mark
! 					)
  				)
  				$sql_extra
  				$sql_sort",
--- 1705,1711 ----
  				(
  				(tt.mark_time IS NOT NULL AND t.topic_last_post_time > tt.mark_time) OR
  				(tt.mark_time IS NULL AND ft.mark_time IS NOT NULL AND t.topic_last_post_time > ft.mark_time) OR
! 				(tt.mark_time IS NULL AND ft.mark_time IS NULL AND t.topic_last_post_time > $last_mark)
  				)
  				$sql_extra
  				$sql_sort",