[xoops-cvslog 4316] CVS update: xoops2jp/html/modules/base/admin/actions

Back to archive index

Tom Hayakawa tom_g3x****@users*****
2006年 8月 23日 (水) 19:03:14 JST


Index: xoops2jp/html/modules/base/admin/actions/HelpAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.13 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.14
--- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.13	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php	Wed Aug 23 19:03:14 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: HelpAction.class.php,v 1.1.2.13 2006/08/18 11:30:00 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.14 2006/08/23 10:03:14 tom_g3x Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -63,14 +63,16 @@
 	}
 }
 
-function Legacy_modifier_helpurl($file)
+function Legacy_modifier_helpurl($file, $dirname = null )
 {
 	$root =& XCube_Root::getSingleton();
-	$modController =& $root->mController->getModuleController();
-	$moduleObject =& $modController->getXoopsModule();
-	
 	$language = $root->mController->getConfig('language');
-	$dirname = $moduleObject->get('dirname');
+
+	if ( $dirname == null ) {
+		$modController =& $root->mController->getModuleController();
+		$moduleObject =& $modController->getXoopsModule();
+		$dirname = $moduleObject->get('dirname');
+	}
 
 	//
 	// TODO We should check file_exists.


xoops-cvslog メーリングリストの案内
Back to archive index