onokazu
onoka****@users*****
2005年 7月 2日 (土) 23:44:29 JST
Index: xoops2jp/html/header.php
diff -u xoops2jp/html/header.php:1.2.6.4.2.1 xoops2jp/html/header.php:1.2.6.4.2.2
--- xoops2jp/html/header.php:1.2.6.4.2.1 Sat Jun 11 11:50:10 2005
+++ xoops2jp/html/header.php Sat Jul 2 23:44:29 2005
@@ -1,5 +1,5 @@
<?php
-// $Id: header.php,v 1.2.6.4.2.1 2005/06/11 02:50:10 onokazu Exp $
+// $Id: header.php,v 1.2.6.4.2.2 2005/07/02 14:44:29 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -87,7 +87,7 @@
// get all blocks and assign to smarty
$xoopsblock = new XoopsBlock();
$block_arr = array();
- if ($xoopsUser != '') {
+ if (is_object($xoopsUser)) {
$xoopsTpl->assign(array('xoops_isuser' => true, 'xoops_userid' => $xoopsUser->getVar('uid'), 'xoops_uname' => $xoopsUser->getVar('uname'), 'xoops_isadmin' => $xoopsUserIsAdmin));
if (!empty($xoopsModule)) {
// set page title
@@ -109,7 +109,7 @@
$xoopsTpl->assign(array('xoops_isuser' => false, 'xoops_isadmin' => false));
if (!empty($xoopsModule)) {
// set page title
- $xoopsTpl->assign(array('xoops_pagetitle' => $xoopsModule->getVar('name'), 'xoops_modulename' => $xoopsModule->getVar('name'), 'xoops_moduledir' => $xoopsModule->getVar('dirname')));
+ $xoopsTpl->assign(array('xoops_pagetitle' => $xoopsModule->getVar('name'), 'xoops_modulename' => $xoopsModule->getVar('name'), 'xoops_dirname' => $xoopsModule->getVar('dirname')));
if (preg_match("/index\.php$/i", xoops_getenv('PHP_SELF')) && $xoopsConfig['startpage'] == $xoopsModule->getVar('dirname')) {
$block_arr =& $xoopsblock->getAllByGroupModule(XOOPS_GROUP_ANONYMOUS, $xoopsModule->getVar('mid'), true, XOOPS_BLOCK_VISIBLE);
} else {