Minahito
minah****@users*****
2007年 4月 25日 (水) 19:35:31 JST
Index: xoops2jp/html/include/comment_view.php
diff -u xoops2jp/html/include/comment_view.php:1.2.8.5.2.3 xoops2jp/html/include/comment_view.php:1.2.8.5.2.3.2.1
--- xoops2jp/html/include/comment_view.php:1.2.8.5.2.3 Fri Jan 19 02:23:55 2007
+++ xoops2jp/html/include/comment_view.php Wed Apr 25 19:35:30 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: comment_view.php,v 1.2.8.5.2.3 2007/01/18 17:23:55 minahito Exp $
+// $Id: comment_view.php,v 1.2.8.5.2.3.2.1 2007/04/25 10:35:30 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -44,8 +44,8 @@
$groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
$xoopsTpl->assign( 'xoops_iscommentadmin', $gperm_handler->checkRight( 'system_admin', LEGACY_SYSTEM_COMMENT, $groups) );
- $root =& XCube_Root::getSingleton();
- $root->mLanguageManager->loadPageTypeMessageCatalog('comment');
+ $t_root =& XCube_Root::getSingleton();
+ $t_root->mLanguageManager->loadPageTypeMessageCatalog('comment');
$comment_config = $xoopsModule->getInfo('comments');
$com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
@@ -154,7 +154,7 @@
}
}
- $renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+ $renderSystem =& $t_root->getRenderSystem($t_root->mContext->mBaseRenderSystemName);
$renderTarget =& $renderSystem->createRenderTarget('main');
$renderTarget->setTemplateName("legacy_comment_navi.html");
Index: xoops2jp/html/include/comment_post.php
diff -u xoops2jp/html/include/comment_post.php:1.2.8.4 xoops2jp/html/include/comment_post.php:1.2.8.4.4.1
--- xoops2jp/html/include/comment_post.php:1.2.8.4 Wed Aug 9 18:32:18 2006
+++ xoops2jp/html/include/comment_post.php Wed Apr 25 19:35:30 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: comment_post.php,v 1.2.8.4 2006/08/09 09:32:18 minahito Exp $
+// $Id: comment_post.php,v 1.2.8.4.4.1 2007/04/25 10:35:30 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -33,8 +33,8 @@
exit();
}
-$root =& XCube_Root::getSingleton();
-$root->mLanguageManager->loadPageTypeMessageCatalog("comment"); ///< @todo Is this must?
+$t_root =& XCube_Root::getSingleton();
+$t_root->mLanguageManager->loadPageTypeMessageCatalog("comment"); ///< @todo Is this must?
include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
Index: xoops2jp/html/include/comment_reply.php
diff -u xoops2jp/html/include/comment_reply.php:1.2.8.3.2.7 xoops2jp/html/include/comment_reply.php:1.2.8.3.2.7.2.1
--- xoops2jp/html/include/comment_reply.php:1.2.8.3.2.7 Fri Jan 19 02:23:55 2007
+++ xoops2jp/html/include/comment_reply.php Wed Apr 25 19:35:30 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: comment_reply.php,v 1.2.8.3.2.7 2007/01/18 17:23:55 minahito Exp $
+// $Id: comment_reply.php,v 1.2.8.3.2.7.2.1 2007/04/25 10:35:30 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -44,10 +44,10 @@
//
// Load message resource
//
-$root =& XCube_Root::getSingleton();
+$t_root =& XCube_Root::getSingleton();
-$root->mLanguageManager->loadModuleMessageCatalog("legacy");
-$root->mLanguageManager->loadPageTypeMessageCatalog("comment"); ///< @todo Is this must?
+$t_root->mLanguageManager->loadModuleMessageCatalog("legacy");
+$t_root->mLanguageManager->loadPageTypeMessageCatalog("comment"); ///< @todo Is this must?
$com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
@@ -126,7 +126,7 @@
//
// Render comment-form to render buffer with using Legacy_RenderSystem.
//
-$renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+$renderSystem =& $t_root->getRenderSystem($t_root->mContext->mBaseRenderSystemName);
$renderTarget =& $renderSystem->createRenderTarget('main');
$renderTarget->setTemplateName("legacy_comment_edit.html");
@@ -134,6 +134,7 @@
$renderTarget->setAttribute("actionForm", $actionForm);
$renderTarget->setAttribute("subjectIcons", $subjectIcons);
$renderTarget->setAttribute("xoopsModuleConfig", $xoopsModuleConfig);
+$renderTarget->setAttribute("com_order", $com_order);
//
// Rendering
Index: xoops2jp/html/include/comment_edit.php
diff -u xoops2jp/html/include/comment_edit.php:1.2.8.2.2.5.2.1 xoops2jp/html/include/comment_edit.php:1.2.8.2.2.5.2.2
--- xoops2jp/html/include/comment_edit.php:1.2.8.2.2.5.2.1 Tue Feb 20 21:49:34 2007
+++ xoops2jp/html/include/comment_edit.php Wed Apr 25 19:35:30 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: comment_edit.php,v 1.2.8.2.2.5.2.1 2007/02/20 12:49:34 nobunobu Exp $
+// $Id: comment_edit.php,v 1.2.8.2.2.5.2.2 2007/04/25 10:35:30 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -43,16 +43,16 @@
//
// Load message resource
//
-$root =& XCube_Root::getSingleton();
+$t_root =& XCube_Root::getSingleton();
-$langManager =& $root->getLanguageManager();
+$langManager =& $t_root->getLanguageManager();
$langManager->loadModuleMessageCatalog("legacy");
if ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE == $xoopsModuleConfig['com_rule']) {
exit();
}
-$root->mLanguageManager->loadPageTypeMessageCatalog('comment');
+$t_root->mLanguageManager->loadPageTypeMessageCatalog('comment');
$com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
$com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : '';
@@ -105,7 +105,7 @@
//
// Render comment-form to render buffer with using Legacy_RenderSystem.
//
- $renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+ $renderSystem =& $t_root->getRenderSystem($t_root->mContext->mBaseRenderSystemName);
$renderTarget =& $renderSystem->createRenderTarget('main');
$renderTarget->setTemplateName("legacy_comment_edit.html");
@@ -113,7 +113,8 @@
$renderTarget->setAttribute("actionForm", $actionForm);
$renderTarget->setAttribute("subjectIcons", $subjectIcons);
$renderTarget->setAttribute("xoopsModuleConfig", $xoopsModuleConfig);
-
+ $renderTarget->setAttribute("com_order", $com_order);
+
//
// Rendering
//
Index: xoops2jp/html/include/comment_new.php
diff -u xoops2jp/html/include/comment_new.php:1.2.8.3.2.6.2.1 xoops2jp/html/include/comment_new.php:1.2.8.3.2.6.2.2
--- xoops2jp/html/include/comment_new.php:1.2.8.3.2.6.2.1 Fri Feb 16 15:22:45 2007
+++ xoops2jp/html/include/comment_new.php Wed Apr 25 19:35:30 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: comment_new.php,v 1.2.8.3.2.6.2.1 2007/02/16 06:22:45 minahito Exp $
+// $Id: comment_new.php,v 1.2.8.3.2.6.2.2 2007/04/25 10:35:30 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -41,9 +41,9 @@
//
// Load message resource
//
-$root =& XCube_Root::getSingleton();
+$t_root =& XCube_Root::getSingleton();
-$root->mLanguageManager->loadModuleMessageCatalog("legacy");
+$t_root->mLanguageManager->loadModuleMessageCatalog("legacy");
require_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
@@ -51,7 +51,7 @@
exit();
}
-$root->mLanguageManager->loadPageTypeMessageCatalog('comment'); ///< Is this must?
+$t_root->mLanguageManager->loadPageTypeMessageCatalog('comment'); ///< Is this must?
$com_itemid = isset($_GET['com_itemid']) ? intval($_GET['com_itemid']) : 0;
@@ -127,7 +127,7 @@
//
// Render comment-form to render buffer with using Legacy_RenderSystem.
//
-$renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+$renderSystem =& $t_root->getRenderSystem($t_root->mContext->mBaseRenderSystemName);
$renderTarget =& $renderSystem->createRenderTarget('main');
$renderTarget->setTemplateName("legacy_comment_edit.html");
@@ -135,6 +135,7 @@
$renderTarget->setAttribute("actionForm", $actionForm);
$renderTarget->setAttribute("subjectIcons", $subjectIcons);
$renderTarget->setAttribute("xoopsModuleConfig", $xoopsModuleConfig);
+$renderTarget->setAttribute("com_order", $com_order);
//
// Rendering
Index: xoops2jp/html/include/comment_delete.php
diff -u xoops2jp/html/include/comment_delete.php:1.2.8.3 xoops2jp/html/include/comment_delete.php:1.2.8.3.4.1
--- xoops2jp/html/include/comment_delete.php:1.2.8.3 Wed Aug 9 18:31:59 2006
+++ xoops2jp/html/include/comment_delete.php Wed Apr 25 19:35:30 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: comment_delete.php,v 1.2.8.3 2006/08/09 09:31:59 minahito Exp $
+// $Id: comment_delete.php,v 1.2.8.3.4.1 2007/04/25 10:35:30 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -105,8 +105,8 @@
exit();
}
-$root =& XCube_Root::getSingleton();
-$root->mLanguageManager->loadPageTypeMessageCatalog('comment'); ///< Is this must?
+$t_root =& XCube_Root::getSingleton();
+$t_root->mLanguageManager->loadPageTypeMessageCatalog('comment'); ///< Is this must?
switch ($op) {
case 'delete_one':