diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php
index 177e1f741..0fd2f3621 100644
--- a/modules/communication/communication.admin.controller.php
+++ b/modules/communication/communication.admin.controller.php
@@ -19,7 +19,9 @@
**/
function procCommunicationAdminInsertConfig() {
// get the default information
- $args = Context::gets('skin','colorset','editor_skin','editor_colorset', 'mskin', 'layout_srl', 'mlayout_srl');
+ $args = Context::gets('skin','colorset','editor_skin','sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl');
+ $args->editor_colorset = $args->sel_editor_colorset;
+ unset($args->sel_editor_colorset);
if(!$args->skin) $args->skin = 'default';
if(!$args->colorset) $args->colorset = 'white';
diff --git a/modules/communication/communication.admin.model.php b/modules/communication/communication.admin.model.php
index 073b9b917..626d800bd 100644
--- a/modules/communication/communication.admin.model.php
+++ b/modules/communication/communication.admin.model.php
@@ -19,10 +19,22 @@
**/
function getCommunicationAdminColorset() {
$skin = Context::get('skin');
+ $type = Context::get('type') == 'P' ? 'P' : 'M';
+ Context::set('type', $type);
+
+ if($type == 'P')
+ {
+ $dir = 'skins';
+ }
+ else
+ {
+ $dir = 'm.skins';
+ }
+
if(!$skin) $tpl = "";
else {
$oModuleModel = &getModel('module');
- $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
+ $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin, $dir);
Context::set('skin_info', $skin_info);
$oModuleModel = &getModel('module');
@@ -39,6 +51,7 @@
}
$this->add('tpl', $tpl);
+ $this->add('type', $type);
}
}
diff --git a/modules/communication/skins/default/send_message.html b/modules/communication/skins/default/send_message.html
index c49eb25cb..4e6a90b16 100644
--- a/modules/communication/skins/default/send_message.html
+++ b/modules/communication/skins/default/send_message.html
@@ -1,6 +1,11 @@