[Customisation Database Commits] r731 - in /trunk/titania/includes: objects/topic.php tools/tracking.php

[Nathan Guse]

Author: exreaction
Date: Sat Mar 13 02:33:19 2010
New Revision: 731

Log:
Wanted to rename this function before, but had forgotten

Modified:
    trunk/titania/includes/objects/topic.php
    trunk/titania/includes/tools/tracking.php

Modified: trunk/titania/includes/objects/topic.php
==============================================================================
*** trunk/titania/includes/objects/topic.php (original)
--- trunk/titania/includes/objects/topic.php Sat Mar 13 02:33:19 2010
***************
*** 193,199 ****
  	{
  		// Tracking check
  		$last_read_mark = titania_tracking::get_track(TITANIA_TOPIC, $this->topic_id, true);
! 		$last_read_mark = max($last_read_mark, titania_tracking::adv_is_unread($this->additional_unread_fields, $this->topic_type, $this->parent_id));
  		$this->unread = ($this->topic_last_post_time > $last_read_mark) ? true : false;
  
  		$folder_img = $folder_alt = '';
--- 193,199 ----
  	{
  		// Tracking check
  		$last_read_mark = titania_tracking::get_track(TITANIA_TOPIC, $this->topic_id, true);
! 		$last_read_mark = max($last_read_mark, titania_tracking::find_last_read_mark($this->additional_unread_fields, $this->topic_type, $this->parent_id));
  		$this->unread = ($this->topic_last_post_time > $last_read_mark) ? true : false;
  
  		$folder_img = $folder_alt = '';

Modified: trunk/titania/includes/tools/tracking.php
==============================================================================
*** trunk/titania/includes/tools/tracking.php (original)
--- trunk/titania/includes/tools/tracking.php Sat Mar 13 02:33:19 2010
***************
*** 108,114 ****
  	*
  	* @return int last mark time
  	*/
! 	public static function adv_is_unread($unread_fields, $object_type, $parent_id)
  	{
  		$last_read_mark = 0;
  
--- 108,114 ----
  	*
  	* @return int last mark time
  	*/
! 	public static function find_last_read_mark($unread_fields, $object_type, $parent_id)
  	{
  		$last_read_mark = 0;
  
***************
*** 158,163 ****
--- 158,169 ----
  		return self::$store[$type][$id];
  	}
  
+ 	/**
+ 	* Get tracking on multiple types/items at the same time from the database
+ 	*
+ 	* @param mixed $type array of types or the type
+ 	* @param mixed $ids array of ids or an id
+ 	*/
  	public static function get_tracks($type, $ids)
  	{
  		// Ignore