merge from luminous 11590 ~ 11593

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11594 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-04 09:29:55 +00:00
parent 30a61a0cb9
commit 3ca52fedc8
3 changed files with 14 additions and 6 deletions

View file

@ -146,6 +146,7 @@
'layout_srl',
'skin',
'colorset',
'mlayout_srl',
'mskin',
'profile_image', 'profile_image_max_width', 'profile_image_max_height',
'image_name', 'image_name_max_width', 'image_name_max_height',
@ -190,6 +191,7 @@
if($args->signature!='Y') $args->signature = 'N';
$args->identifier = $all_args->identifier;
$args->layout_srl = $args->layout_srl ? $args->layout_srl : null;
$args->mlayout_srl = $args->mlayout_srl ? $args->mlayout_srl : null;
// set default
$all_args->is_nick_name_public = 'Y';