From: <lph...@us...> - 2008-08-25 15:56:10
|
Revision: 14499 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=14499&view=rev Author: lphuberdeau Date: 2008-08-25 15:56:05 +0000 (Mon, 25 Aug 2008) Log Message: ----------- [FIX] Confusion in comments between different languages Modified Paths: -------------- branches/experimental/all-langs/comments.php branches/experimental/all-langs/tiki-all_languages.php Modified: branches/experimental/all-langs/comments.php =================================================================== --- branches/experimental/all-langs/comments.php 2008-08-25 15:43:27 UTC (rev 14498) +++ branches/experimental/all-langs/comments.php 2008-08-25 15:56:05 UTC (rev 14499) @@ -138,7 +138,7 @@ } } -$smarty->assign_by_ref('comments_request_data', $comments_aux); +$smarty->assign('comments_request_data', $comments_aux); if (!isset($_REQUEST['comments_threshold'])) { $_REQUEST['comments_threshold'] = 0; @@ -188,12 +188,14 @@ $comments_prefix_var = ''; } -if (!isset($_REQUEST[$comments_object_var])) { - die ("The comments_object_var variable cannot be found as a REQUEST variable"); +if( ! isset( $comments_objectId ) ) { + if (!isset($_REQUEST[$comments_object_var])) { + die ("The comments_object_var variable cannot be found as a REQUEST variable"); + } + + $comments_objectId = $comments_prefix_var . $_REQUEST["$comments_object_var"]; } -$comments_objectId = $comments_prefix_var . $_REQUEST["$comments_object_var"]; - $message_id = ''; $in_reply_to = ''; // Process a post form here Modified: branches/experimental/all-langs/tiki-all_languages.php =================================================================== --- branches/experimental/all-langs/tiki-all_languages.php 2008-08-25 15:43:27 UTC (rev 14498) +++ branches/experimental/all-langs/tiki-all_languages.php 2008-08-25 15:56:05 UTC (rev 14499) @@ -44,15 +44,15 @@ $renderer = new WikiRenderer( $info, $user ); $renderer->applyPermissions(); $renderer->runSetups(); - $contents[] = $smarty->fetch('tiki-show_page.tpl'); $comments_per_page = $prefs['wiki_comments_per_page']; $thread_sort_mode = $prefs['wiki_comments_default_ordering']; $comments_vars=Array('page'); - $comments_prefix_var='wiki page:'; - $comments_object_var='page'; + $comments_objectId = 'wiki page:' . $info['pageName']; include('comments.php'); + $contents[] = $smarty->fetch('tiki-show_page.tpl'); + if( $id != $page_id ) $renderer->restoreAll(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |