[Customisation Database Commits] r641 - in /trunk/titania/includes: objects/topic.php overlords/posts.php overlords/queue.php overlords/topics.php

[Nathan Guse]

Author: exreaction
Date: Mon Feb 22 03:20:06 2010
New Revision: 641

Log:
Fix some tracking stuff

Modified:
    trunk/titania/includes/objects/topic.php
    trunk/titania/includes/overlords/posts.php
    trunk/titania/includes/overlords/queue.php
    trunk/titania/includes/overlords/topics.php

Modified: trunk/titania/includes/objects/topic.php
==============================================================================
*** trunk/titania/includes/objects/topic.php (original)
--- trunk/titania/includes/objects/topic.php Mon Feb 22 03:20:06 2010
***************
*** 205,210 ****
--- 205,212 ----
  	*/
  	public function assign_details()
  	{
+ 		$this->unread = titania_tracking::is_unread(TITANIA_TOPIC, $this->topic_id, $this->topic_last_post_time);
+ 
  		$folder_img = $folder_alt = '';
  		$this->topic_folder_img($folder_img, $folder_alt);
  

Modified: trunk/titania/includes/overlords/posts.php
==============================================================================
*** trunk/titania/includes/overlords/posts.php (original)
--- trunk/titania/includes/overlords/posts.php Mon Feb 22 03:20:06 2010
***************
*** 320,326 ****
  				$post->assign_details(),
  				users_overlord::assign_details($post->post_user_id),
  				array(
! 					'S_FIRST_UNREAD'		=> ($post->post_time >= $last_mark_time && $prev_post_time < $last_mark_time) ? true : false,
  				)
  			));
  	//S_IGNORE_POST
--- 320,326 ----
  				$post->assign_details(),
  				users_overlord::assign_details($post->post_user_id),
  				array(
! 					'S_FIRST_UNREAD'		=> ($post->post_time >= $last_mark_time && $prev_post_time <= $last_mark_time) ? true : false,
  				)
  			));
  	//S_IGNORE_POST

Modified: trunk/titania/includes/overlords/queue.php
==============================================================================
*** trunk/titania/includes/overlords/queue.php (original)
--- trunk/titania/includes/overlords/queue.php Mon Feb 22 03:20:06 2010
***************
*** 157,163 ****
  			// Store the tracking info we grabbed in the tool
  			if (isset($row['track_time']))
  			{
! 				titania_tracking::store_track(TITANIA_QUEUE, $row['queue_id'], $row['track_time']);
  			}
  
  			$queue_ids[] = $row['queue_id'];
--- 157,163 ----
  			// Store the tracking info we grabbed in the tool
  			if (isset($row['track_time']))
  			{
! 				titania_tracking::store_track(TITANIA_TOPIC, $row['topic_id'], $row['track_time']);
  			}
  
  			$queue_ids[] = $row['queue_id'];
***************
*** 178,184 ****
  			$row = self::$queue[$queue_id];
  
  			$topic->__set_array($row);
- 			$topic->unread = titania_tracking::is_unread(TITANIA_QUEUE, $row['queue_id'], max($row['queue_submit_time'], $row['topic_last_post_time']));
  
  			phpbb::$template->assign_block_vars('topics', array_merge($topic->assign_details(), array(
  				'TOPIC_SUBJECT'				=> $row['contrib_name'] . ' - ' . $row['revision_version'],
--- 178,183 ----
***************
*** 228,236 ****
  			trigger_error('NO_QUEUE_ITEM');
  		}
  
- 		// Store tracking time
- 		titania_tracking::track(TITANIA_QUEUE, $queue_id);
- 
  		// Load the contribution
  		$contrib = new titania_contribution();
  		$contrib->load((int) $row['contrib_id']);
--- 227,232 ----

Modified: trunk/titania/includes/overlords/topics.php
==============================================================================
*** trunk/titania/includes/overlords/topics.php (original)
--- trunk/titania/includes/overlords/topics.php Mon Feb 22 03:20:06 2010
***************
*** 290,296 ****
  			self::$topics[$row['topic_id']] = $row;
  
  			$topic->__set_array($row);
- 			$topic->unread = titania_tracking::is_unread(TITANIA_TOPIC, $topic->topic_id, $topic->topic_last_post_time);
  
  			phpbb::$template->assign_block_vars('topics', array_merge($topic->assign_details(), array(
  				'S_TOPIC_TYPE_SWITCH'		=> ($last_was_sticky && !$topic->topic_sticky) ? true : false,
--- 290,295 ----