[Customisation Database Commits] r1761 - in /trunk/titania/includes: overlords/posts.php tools/sort.php

[Nathan Guse]

Author: exreaction
Date: Fri Oct 15 19:47:41 2010
New Revision: 1761

Log:
Fixing an error where the sent sort key was not an available option http://www.phpbb.com/community/viewtopic.php?f=66&t=2107249

Modified:
    trunk/titania/includes/overlords/posts.php
    trunk/titania/includes/tools/sort.php

Modified: trunk/titania/includes/overlords/posts.php
==============================================================================
*** trunk/titania/includes/overlords/posts.php (original)
--- trunk/titania/includes/overlords/posts.php Fri Oct 15 19:47:41 2010
***************
*** 214,220 ****
  	* Display topic section for support/tracker/etc
  	*
  	* @param object $topic The topic object
! 	* @param object|boolean $sort The sort object (includes/tools/sort.php)
  	*/
  	public static function display_topic($topic, $sort = false)
  	{
--- 214,220 ----
  	* Display topic section for support/tracker/etc
  	*
  	* @param object $topic The topic object
! 	* @param titania_sort $sort The sort object (includes/tools/sort.php)
  	*/
  	public static function display_topic($topic, $sort = false)
  	{

Modified: trunk/titania/includes/tools/sort.php
==============================================================================
*** trunk/titania/includes/tools/sort.php (original)
--- trunk/titania/includes/tools/sort.php Fri Oct 15 19:47:41 2010
***************
*** 183,188 ****
--- 183,193 ----
  	{
  		$this->sort_key = request_var($this->sort_key_name, (string) $this->default_sort_key);
  
+ 		if (!isset($this->sort_key_ary[$this->sort_key]))
+ 		{
+ 			$this->sort_key = $this->default_sort_key;
+ 		}
+ 
  		return $this->sort_key;
  	}