Minahito
minah****@users*****
2006年 9月 28日 (木) 14:01:28 JST
Index: xoops2jp/html/modules/base/admin/actions/ThemeListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ThemeListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/ThemeListAction.class.php:1.1.2.1.2.1
--- xoops2jp/html/modules/base/admin/actions/ThemeListAction.class.php:1.1.2.1 Wed Aug 2 18:36:35 2006
+++ xoops2jp/html/modules/base/admin/actions/ThemeListAction.class.php Thu Sep 28 14:01:28 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: ThemeListAction.class.php,v 1.1.2.1 2006/08/02 09:36:35 minahito Exp $
+ * @version $Id: ThemeListAction.class.php,v 1.1.2.1.2.1 2006/09/28 05:01:28 minahito Exp $
*/
require_once XOOPS_MODULE_PATH . "/base/admin/forms/ThemeSelectForm.class.php";
@@ -33,7 +33,7 @@
{
$this->_setupObject();
$this->_setupActionForm();
- $this->mMainTheme =& $controller->getMainTheme();
+ $this->mMainTheme =& $controller->getTheme();
}
function _setupObject()
Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.10.2.1
--- xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.10 Mon Sep 25 18:34:40 2006
+++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php Thu Sep 28 14:01:28 2006
@@ -101,17 +101,13 @@
//
// TODO : We don't use handler and write sql directly.
//
- $sql = "SELECT {mod}.* FROM {mod},{perm} ".
- "WHERE {mod}.mid={perm}.gperm_itemid AND {perm}.gperm_name='module_admin' AND {perm}.gperm_groupid IN ({groups}) ".
- "ORDER BY {mod}.weight";
-
- $replaceMap = array(
- "mod"=>$db->prefix("modules"),
- "perm"=>$db->prefix("group_permission"),
- "groups"=>implode(",",$xoopsUser->getGroups())
- );
-
- $sql = XCube_Utils::formatMessageByMap($sql,$replaceMap);
+ $mod = $db->prefix("modules");
+ $perm = $db->prefix("group_permission");
+ $groups = implode(",", $xoopsUser->getGroups());
+
+ $sql = "SELECT ${mod}.* FROM ${mod},${perm} " .
+ "WHERE ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " .
+ "ORDER BY ${mod}.weight";
$result = $db->query($sql);
while ($row = $db->fetchArray($result)) {