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

merge sandbox to trunk for 1.4.4

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

5
modules/member/member.admin.controller.php
View file

@ -1,7 +1,7 @@
<?php
/**
* @class memberAdminController
* @author zero (zero@nzeo.com)
* @author NHN (developers@xpressengine.com)
* @brief member module의 admin controller class
**/
@ -95,7 +95,7 @@
'image_name', 'image_name_max_width', 'image_name_max_height',
'image_mark', 'image_mark_max_width', 'image_mark_max_height',
'group_image_mark', 'group_image_mark_max_width', 'group_image_mark_max_height',
'signature','signature_max_height'
'signature','signature_max_height','change_password_date'
);
if(!$args->skin) $args->skin = "default";
@ -111,6 +111,7 @@
if($args->signature!='Y') $args->signature = 'N';
if(!trim(strip_tags($args->agreement))) $args->agreement = null;
$args->limit_day = (int)$args->limit_day;
if(!$args->change_password_date) $args->change_password_date = 0;
$oMemberController = &getController('member');
$output = $oMemberController->setMemberConfig($args);