svnno****@sourc*****
svnno****@sourc*****
2009年 10月 3日 (土) 15:10:05 JST
Revision: 199
http://sourceforge.jp/projects/cinemaru/svn/view?view=rev&revision=199
Author: asben
Date: 2009-10-03 15:10:05 +0900 (Sat, 03 Oct 2009)
Log Message:
-----------
Cinamaruのサムネイル表示ブロックの表示対象をを全ページにしたとき、d3pipesが壊れる不具合修正。
oops様指摘（掲示板より）。
修正はGIJOE様のコードを利用しました。
Modified Paths:
--------------
trunk/html/modules/cinemaru/blocks/cinemaru_block_hottag.php
trunk/html/modules/cinemaru/blocks/cinemaru_block_random.php
trunk/html/modules/cinemaru/blocks/cinemaru_block_thumb.php
Modified: trunk/html/modules/cinemaru/blocks/cinemaru_block_hottag.php
===================================================================
--- trunk/html/modules/cinemaru/blocks/cinemaru_block_hottag.php 2009-08-24 10:30:22 UTC (rev 198)
+++ trunk/html/modules/cinemaru/blocks/cinemaru_block_hottag.php 2009-10-03 06:10:05 UTC (rev 199)
@@ -23,7 +23,7 @@
$mydirname_cinemaru = $options[0];
//return array();
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname_cinemaru . '/include/db.php');
- require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname_cinemaru . '/include/misc.php');
+ require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname_cinemaru . '/include/misc.php');
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname_cinemaru . '/constants.php');
$constpref = strtoupper( $mydirname_cinemaru ) ;
Modified: trunk/html/modules/cinemaru/blocks/cinemaru_block_random.php
===================================================================
--- trunk/html/modules/cinemaru/blocks/cinemaru_block_random.php 2009-08-24 10:30:22 UTC (rev 198)
+++ trunk/html/modules/cinemaru/blocks/cinemaru_block_random.php 2009-10-03 06:10:05 UTC (rev 199)
@@ -15,6 +15,7 @@
} else {
$mydirname_cinemaru = $options[0];
}
+ $global_mydirname = $GLOBALS['mydirname'] ; // GIJ
$GLOBALS['mydirname'] = $mydirname_cinemaru;
$constpref = strtoupper($mydirname_cinemaru);
@@ -54,10 +55,13 @@
}
//--------------------------------
$xoopsTpl->assign('cinemaru_block_randam', $movie);
+
+ $GLOBALS['mydirname'] = $global_mydirname; // GIJ
return $movie;
}
}
+ $GLOBALS['mydirname'] = $global_mydirname; // GI
return array();
}
Modified: trunk/html/modules/cinemaru/blocks/cinemaru_block_thumb.php
===================================================================
--- trunk/html/modules/cinemaru/blocks/cinemaru_block_thumb.php 2009-08-24 10:30:22 UTC (rev 198)
+++ trunk/html/modules/cinemaru/blocks/cinemaru_block_thumb.php 2009-10-03 06:10:05 UTC (rev 199)
@@ -14,6 +14,7 @@
}
$mydirname = $options[0];
+ $global_mydirname = $GLOBALS['mydirname'] ; // asben
$GLOBALS['mydirname'] = $mydirname;
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/constants.php');
@@ -30,6 +31,7 @@
$xoopsTpl->assign($mydirname . '_movie_list', $movie_list);
$xoopsTpl->assign('movie_list', $movie_list);
+ $GLOBALS['mydirname'] = $global_mydirname; // GIJ
return array(1);
}