[xoops-cvslog 3725] CVS update: xoops2jp/html/modules/base/class

Zurück zum Archiv-Index

Minahito minah****@users*****
2006年 7月 27日 (木) 18:33:51 JST


Index: xoops2jp/html/modules/base/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.9 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.10
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.9	Thu Jul 27 14:59:40 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php	Thu Jul 27 18:33:51 2006
@@ -22,6 +22,7 @@
 define ("LEGACY_FRAME_MODE_MISC", "Misc");
 define ("LEGACY_FRAME_MODE_NOTIFY", "Notify");
 define ("LEGACY_FRAME_MODE_IMAGE", "Image");
+define ("LEGACY_FRAME_MODE_SEARCH", "Search");
 
 class Legacy_ActionFrame extends XCube_ActionStrategy
 {
@@ -59,9 +60,17 @@
 
 	function execute(&$controller)
 	{
-		if (!preg_match("/^\w+$/", $this->mActionName)) {
+		if (strlen($this->mActionName) > 0 && !preg_match("/^\w+$/", $this->mActionName)) {
 			die();
 		}
+
+		//
+		// Actions of the public side in this module are hook type. So it's
+		// necessary to load catalog here.
+		//		
+		if (!$this->mAdminFlag) {
+			$controller->mRoot->mLanguageManager->loadModuleMessageCatalog('base');
+		}
 		
 		//
 		// Add mode.


xoops-cvslog メーリングリストの案内
Zurück zum Archiv-Index