From: <pk...@us...> - 2009-04-30 15:00:15
|
Revision: 18326 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18326&view=rev Author: pkdille Date: 2009-04-30 15:00:13 +0000 (Thu, 30 Apr 2009) Log Message: ----------- [FIX] view forum: Do not go in edit mode after a topic deletion (thks nyloth) Modified Paths: -------------- branches/3.0/tiki-view_forum.php Modified: branches/3.0/tiki-view_forum.php =================================================================== --- branches/3.0/tiki-view_forum.php 2009-04-30 14:31:02 UTC (rev 18325) +++ branches/3.0/tiki-view_forum.php 2009-04-30 15:00:13 UTC (rev 18326) @@ -294,23 +294,6 @@ $smarty->assign_by_ref('userinfo',$userinfo); } -if ($_REQUEST["comments_threadId"] > 0) { - $comment_info = $commentslib->get_comment($_REQUEST["comments_threadId"]); - - $smarty->assign('comment_title', isset($_REQUEST['comments_title']) ? $_REQUEST['comments_title'] : $comment_info['title']); - $smarty->assign('comment_data', isset($_REQUEST['comments_data']) ? $_REQUEST['comments_data'] : $comment_info['data']); - $smarty->assign('comment_topictype', isset($_REQUEST['comment_topictype']) ? $_REQUEST['comment_topictype'] : $comment_info["type"]); - $smarty->assign('comment_topicsummary', isset($_REQUEST["comment_topicsummary"]) ? $_REQUEST["comment_topicsummary"] : $comment_info["summary"]); - $smarty->assign('comment_topicsmiley', $comment_info["smiley"]); -} else { - $smarty->assign('comment_title', isset($_REQUEST["comments_title"]) ? $_REQUEST["comments_title"] : ''); - $smarty->assign('comment_data', isset($_REQUEST["comments_data"]) ? $_REQUEST["comments_data"] : ''); - $smarty->assign('comment_topictype', isset($_REQUEST["comment_topictype"]) ? $_REQUEST["comment_topictype"] : ''); - $smarty->assign('comment_topictype', 'n'); - $smarty->assign('comment_topicsummary', ''); - $smarty->assign('comment_topicsmiley', ''); -} - if (isset($_REQUEST["comments_remove"]) && isset($_REQUEST["comments_threadId"])) { if ($tiki_p_admin_forum == 'y' @@ -335,8 +318,26 @@ $smarty->display("error.tpl"); die; } + unset($_REQUEST["comments_threadId"]); } +if ($_REQUEST["comments_threadId"] > 0) { + $comment_info = $commentslib->get_comment($_REQUEST["comments_threadId"]); + + $smarty->assign('comment_title', isset($_REQUEST['comments_title']) ? $_REQUEST['comments_title'] : $comment_info['title']); + $smarty->assign('comment_data', isset($_REQUEST['comments_data']) ? $_REQUEST['comments_data'] : $comment_info['data']); + $smarty->assign('comment_topictype', isset($_REQUEST['comment_topictype']) ? $_REQUEST['comment_topictype'] : $comment_info["type"]); + $smarty->assign('comment_topicsummary', isset($_REQUEST["comment_topicsummary"]) ? $_REQUEST["comment_topicsummary"] : $comment_info["summary"]); + $smarty->assign('comment_topicsmiley', $comment_info["smiley"]); +} else { + $smarty->assign('comment_title', isset($_REQUEST["comments_title"]) ? $_REQUEST["comments_title"] : ''); + $smarty->assign('comment_data', isset($_REQUEST["comments_data"]) ? $_REQUEST["comments_data"] : ''); + $smarty->assign('comment_topictype', isset($_REQUEST["comment_topictype"]) ? $_REQUEST["comment_topictype"] : ''); + $smarty->assign('comment_topictype', 'n'); + $smarty->assign('comment_topicsummary', ''); + $smarty->assign('comment_topicsmiley', ''); +} + $smarty->assign('comment_preview', 'n'); if (isset($_REQUEST["comments_previewComment"])) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |