[Tikiwiki-cvs] tiki tiki-view_forum_thread.php,1.24,1.25

[<re...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1:/tmp/cvs-serv21405

Modified Files:
	tiki-view_forum_thread.php 
Log Message:
conflicts


Index: tiki-view_forum_thread.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-view_forum_thread.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- tiki-view_forum_thread.php	7 Aug 2003 04:33:57 -0000	1.24
+++ tiki-view_forum_thread.php	15 Aug 2003 22:37:48 -0000	1.25
@@ -34,7 +34,7 @@
 	$_REQUEST['topics_offset'] = 1;
 }
 
-if (!isset($_REQUEST['topics_sort_mode'])) {
+if(!isset($_REQUEST['topics_sort_mode']) || empty($_REQUEST['topics_sort_mode'])) {
 	$_REQUEST['topics_sort_mode'] = 'commentDate_desc';
 }
 
@@ -42,7 +42,7 @@
 	$_REQUEST['topics_find'] = '';
 }
 
-if (!isset($_REQUEST['topics_threshold'])) {
+if(!isset($_REQUEST['topics_threshold']) || empty($_REQUEST['topics_threshold'])) {
 	$_REQUEST['topics_threshold'] = 0;
 }
 
@@ -699,4 +699,4 @@
 $smarty->assign('mid', 'tiki-view_forum_thread.tpl');
 $smarty->display("styles/$style_base/tiki.tpl");
 
-?>
\ No newline at end of file
+?>