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

Back to archive index

Minahito minah****@users*****
2006年 8月 6日 (日) 00:58:33 JST


Index: xoops2jp/html/modules/base/actions/MiscFriendAction.class.php
diff -u xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.1 xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.1	Sat Aug  5 22:20:55 2006
+++ xoops2jp/html/modules/base/actions/MiscFriendAction.class.php	Sun Aug  6 00:58:33 2006
@@ -22,11 +22,6 @@
 
 	function prepare(&$controller, &$xoopsUser)
 	{
-		//
-		// TODO We will remove the following loading.
-		//
-		$controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('misc');
-		
 		$this->mActionForm =& new Legacy_MiscFriendForm();
 		$this->mActionForm->prepare();
 	}
@@ -54,7 +49,7 @@
 		
 		$this->mActionForm->update($this->mMailer);
 		
-		$this->mMailer->setSubject(sprintf(_MSC_INTSITE, $xoopsConfig['sitename']));
+		$this->mMailer->setSubject(sprintf(_MSC_INTSITE, $controller->getConfig('sitename')));
 		
 		return $this->mMailer->send() ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR;
 	}
@@ -73,7 +68,7 @@
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("legacy_misc_friend_error.html");
-		$render->setTemplate('xoopsMailer', $this->mMailer);
+		$render->setAttribute('xoopsMailer', $this->mMailer);
 	}
 }
 


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