Minahito
minah****@users*****
2007年 4月 17日 (火) 18:06:10 JST
Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.10.2.4 xoops2jp/html/kernel/block.php:1.2.8.10.2.4.2.1
--- xoops2jp/html/kernel/block.php:1.2.8.10.2.4 Sun Dec 3 00:57:39 2006
+++ xoops2jp/html/kernel/block.php Tue Apr 17 18:06:09 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: block.php,v 1.2.8.10.2.4 2006/12/02 15:57:39 nobunobu Exp $
+// $Id: block.php,v 1.2.8.10.2.4.2.1 2007/04/17 09:06:09 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -778,7 +778,7 @@
$ret = array();
$sql = "SELECT DISTINCT gperm_itemid FROM ".$this->db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1";
if ( is_array($groupid) ) {
- $sql .= ' AND gperm_groupid IN ('.addslashes(implode(',', $groupid)).')';
+ $sql .= ' AND gperm_groupid IN ('.addslashes(implode(',', array_map('intval', $groupid))).')';
} else {
if (intval($groupid) > 0) {
$sql .= ' AND gperm_groupid='.intval($groupid);
@@ -790,13 +790,15 @@
$blockids[] = $myrow['gperm_itemid'];
}
if (!empty($blockids)) {
- $sql = 'SELECT b.* FROM '.$this->db->prefix('newblocks').' b, '.$this->db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
- $sql .= ' AND b.isactive=1 AND b.visible=1 ';
+ $sql = 'SELECT b.* FROM '.$this->db->prefix('newblocks').' b, '.$this->db->prefix('block_module_link').' m, ' . $this->db->prefix('modules') . ' md WHERE m.block_id=b.bid';
+ $sql .= ' AND b.isactive=1 AND b.visible=1';
if ($mid !== false && $mid !== 0) {
$sql .= ' AND m.module_id IN (0,'.intval($mid).')';
} else {
$sql .= ' AND m.module_id=0';
}
+
+ $sql .= ' AND b.mid = md.mid AND md.isactive=1';
//
// SIDE