merge from luminous (r11590)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11632 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-08 10:09:47 +00:00
parent ca554aad56
commit 2bf71d6660
4 changed files with 34 additions and 1 deletions

View file

@ -19,7 +19,7 @@
**/
function procCommunicationAdminInsertConfig() {
// get the default information
$args = Context::gets('skin','colorset','editor_skin','editor_colorset', 'mskin','layout_srl');
$args = Context::gets('skin','colorset','editor_skin','editor_colorset', 'mskin', 'layout_srl', 'mlayout_srl');
if(!$args->skin) $args->skin = 'default';
if(!$args->colorset) $args->colorset = 'white';