merge sandbox to trunk for 1.4.4

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7723 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-28 07:24:47 +00:00
parent 200d63636c
commit b8299c8a65
683 changed files with 70982 additions and 69716 deletions

View file

@ -1,31 +1,31 @@
<?php
/**
* @class messageAdminController
* @author zero (zero@nzeo.com)
* @brief message module의 admin controller class
**/
class messageAdminController extends message {
/**
* @brief 초기화
**/
function init() {
}
/**
* @brief 설정
**/
function procMessageAdminInsertConfig() {
// 기본 정보를 받음
$args->skin = Context::get('skin');
// module Controller 객체 생성하여 입력
$oModuleController = &getController('module');
$output = $oModuleController->insertModuleConfig('message',$args);
if(!$output->toBool()) return $output;
$this->setMessage('success_updated');
}
}
?>
<?php
/**
* @class messageAdminController
* @author NHN (developers@xpressengine.com)
* @brief message module의 admin controller class
**/
class messageAdminController extends message {
/**
* @brief 초기화
**/
function init() {
}
/**
* @brief 설정
**/
function procMessageAdminInsertConfig() {
// 기본 정보를 받음
$args->skin = Context::get('skin');
// module Controller 객체 생성하여 입력
$oModuleController = &getController('module');
$output = $oModuleController->insertModuleConfig('message',$args);
if(!$output->toBool()) return $output;
$this->setMessage('success_updated');
}
}
?>