Minahito
minah****@users*****
2006年 7月 20日 (木) 17:18:39 JST
Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.12 xoops2jp/html/kernel/module.php:1.2.8.13
--- xoops2jp/html/kernel/module.php:1.2.8.12 Sun Jul 16 15:41:33 2006
+++ xoops2jp/html/kernel/module.php Thu Jul 20 17:18:39 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: module.php,v 1.2.8.12 2006/07/16 06:41:33 minahito Exp $
+// $Id: module.php,v 1.2.8.13 2006/07/20 08:18:39 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -197,11 +197,9 @@
return;
}
- if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$dirname.'/language/'.$xoopsConfig['language'].'/modinfo.php')) {
- include_once XOOPS_ROOT_PATH.'/modules/'.$dirname.'/language/'.$xoopsConfig['language'].'/modinfo.php';
- } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/'.$dirname.'/language/english/modinfo.php')) {
- include_once XOOPS_ROOT_PATH.'/modules/'.$dirname.'/language/english/modinfo.php';
- }
+ $root =& XCube_Root::getSingleton();
+ $root->mLanguageManager->loadModinfoMessageCatalog($dirname);
+
if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$dirname.'/xoops_version.php')) {
include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/xoops_version.php';
} else {