fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into fuxml/no-xml-lang

Browse source 
Conflicts:
	modules/comment/lang/lang.xml
	modules/document/lang/lang.xml
	modules/member/lang/lang.xml
This commit is contained in:
Kijin Sung 2016-01-31 16:13:03 +09:00
commit 4797e858b8
46 changed files with 1230 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/board/board.controller.php
View file

@ -148,6 +148,12 @@ class boardController extends board
{
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
$is_logged = Context::get('is_logged');
if(!$is_logged && !$member_config->webmaster_email)
{
$obj->email_address = $this->module_info->admin_mail;
}
$oMail = new Mail();
$oMail->setTitle($obj->title);