onokazu
onoka****@users*****
2006年 2月 6日 (月) 17:37:39 JST
Index: xoops2jp/html/class/xoopsblock.php
diff -u xoops2jp/html/class/xoopsblock.php:1.4.6.2 xoops2jp/html/class/xoopsblock.php:1.4.6.3
--- xoops2jp/html/class/xoopsblock.php:1.4.6.2 Mon Feb 6 14:43:57 2006
+++ xoops2jp/html/class/xoopsblock.php Mon Feb 6 17:37:39 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: xoopsblock.php,v 1.4.6.2 2006/02/06 05:43:57 onokazu Exp $
+// $Id: xoopsblock.php,v 1.4.6.3 2006/02/06 08:37:39 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -335,7 +335,7 @@
if (!$asobject) {
$ret[] = $myrow['bid'];
} else {
- $ret[] = new XoopsBlock($myrow);
+ $ret[] =& new XoopsBlock($myrow);
}
array_push($added, $myrow['bid']);
}
@@ -369,16 +369,17 @@
$sql = "SELECT * FROM ".$db->prefix("newblocks")."".$where_query;
$result = $db->query($sql);
while ( $myrow = $db->fetchArray($result) ) {
- $ret[] = new XoopsBlock($myrow);
+ $ret[] =& new XoopsBlock($myrow);
}
break;
case "list":
$sql = "SELECT * FROM ".$db->prefix("newblocks")."".$where_query;
$result = $db->query($sql);
while ( $myrow = $db->fetchArray($result) ) {
- $block = new XoopsBlock($myrow);
+ $block =& new XoopsBlock($myrow);
$name = ($block->getVar("block_type") != "C") ? $block->getVar("name") : $block->getVar("title");
$ret[$block->getVar("bid")] = $name;
+ unset($block);
}
break;
case "id":
Index: xoops2jp/html/class/xoopslists.php
diff -u xoops2jp/html/class/xoopslists.php:1.4 xoops2jp/html/class/xoopslists.php:1.4.6.1
--- xoops2jp/html/class/xoopslists.php:1.4 Wed Aug 3 21:39:11 2005
+++ xoops2jp/html/class/xoopslists.php Mon Feb 6 17:37:39 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: xoopslists.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: xoopslists.php,v 1.4.6.1 2006/02/06 08:37:39 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -46,7 +46,8 @@
*/
function &getThemesList()
{
- return XoopsLists::getDirListAsArray(XOOPS_THEME_PATH.'/');
+ $ret =& XoopsLists::getDirListAsArray(XOOPS_THEME_PATH.'/');
+ return $ret;
}
/*
@@ -54,7 +55,8 @@
*/
function &getModulesList()
{
- return XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH."/modules/");
+ $ret =& XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH."/modules/");
+ return $ret;
}
/*
@@ -172,10 +174,10 @@
foreach ( $dirlist as $dir ) {
$avatars[$dir] =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/images/avatar/".$dir."/", $dir."/");
}
- } else {
- return false;
+ return $avatars;
}
- return $avatars;
+ $ret = false;
+ return $ret;
}
/*