Minahito
minah****@users*****
2006年 7月 20日 (木) 17:18:31 JST
Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.8 xoops2jp/html/kernel/block.php:1.2.8.9
--- xoops2jp/html/kernel/block.php:1.2.8.8 Sat Jul 1 13:17:28 2006
+++ xoops2jp/html/kernel/block.php Thu Jul 20 17:18:31 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: block.php,v 1.2.8.8 2006/07/01 04:17:28 minahito Exp $
+// $Id: block.php,v 1.2.8.9 2006/07/20 08:18:31 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -171,8 +171,7 @@
// must get lang files b4 execution of the function
if ( file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file')) ) {
$root=&XCube_Root::getSingleton();
- $languageManager=$root->getLanguageManager();
- $languageManager->loadBlockLanguage($this->getVar('dirname'));
+ $root->mLanguageManager->loadBlockLanguage($this->getVar('dirname'));
require_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file');
$options = explode('|', $this->getVar('options'));
@@ -246,11 +245,9 @@
return false;
}
if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file'))) {
- if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php')) {
- include_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php';
- } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/english/blocks.php')) {
- include_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/english/blocks.php';
- }
+ $root =& XCube_Root::getSingleton();
+ $root->mLanguageManager->loadBlockMessageCatalog($this->getVar('dirname'));
+
include_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file');
$options = explode('|', $this->getVar('options'));
$edit_form = $edit_func($options);