fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-27 22:33:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix merge error

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9276 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 10:19:58 +00:00
parent c32beaf35e
commit d311ccc377
14 changed files with 59 additions and 2439 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/message/message.admin.view.php
View file

@ -1,4 +1,3 @@
<<<<<<< .working
<?php
/**
* @class messageAdminView
@ -26,42 +25,6 @@
$config = $oModuleModel->getModuleConfig('message');
Context::set('config',$config);
// Set a template file
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('config');
}
}
?>
=======
<?php
/**
* @class messageAdminView
* @author NHN (developers@xpressengine.com)
* @brief message모듈의 admin view class
**/
class messageAdminView extends message {
/**
* @brief 초기화
**/
function init() {
}
/**
* @brief 설정
**/
function dispMessageAdminConfig() {
// 스킨 목록을 구해옴
$oModuleModel = &getModel('module');
$skin_list = $oModuleModel->getskins($this->module_path);
Context::set('skin_list', $skin_list);
// 설정 정보를 받아옴 (module model 객체를 이용)
$config = $oModuleModel->getModuleConfig('message');
Context::set('config',$config);
// 템플릿 파일 지정
$this->setTemplatePath($this->module_path.'tpl');
//Security
@ -73,4 +36,3 @@
}
?>
>>>>>>> .merge-right.r9269