Minahito
minah****@users*****
2006年 2月 9日 (木) 18:09:32 JST
Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.4 xoops2jp/html/kernel/block.php:1.2.8.5
--- xoops2jp/html/kernel/block.php:1.2.8.4 Fri Dec 30 17:21:52 2005
+++ xoops2jp/html/kernel/block.php Thu Feb 9 18:09:32 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: block.php,v 1.2.8.4 2005/12/30 08:21:52 minahito Exp $
+// $Id: block.php,v 1.2.8.5 2006/02/09 09:09:32 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -273,7 +273,7 @@
}
$isNew = false;
-
+
if ($block->isNew()) {
$isNew = true;
$bid = $this->db->genId('newblocks_bid_seq');
@@ -294,7 +294,7 @@
//
if ($isNew && $autolink) {
$link_sql = "INSERT INTO " . $this->db->prefix('block_module_link') . " (block_id, module_id) VALUES (${bid}, -1)";
- return $this->db->query($sql);
+ return $this->db->query($link_sql);
}
return true;
@@ -363,7 +363,7 @@
$sql = "SELECT * FROM " . $this->db->prefix('newblocks');
if ($criteria)
$sql .= " " . $criteria->renderWhere();
-
+
$result = $this->db->query($sql);
if (!$result) {
return $ret;
@@ -372,6 +372,9 @@
while ($row = $this->db->fetchArray($result)) {
$block = new XoopsBlock();
$block->assignVars($row);
+
+ $ret[] =& $block;
+
unset($block);
}