merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -0,0 +1,29 @@
<?php
class messageAdminModel extends message{
public function getMessageAdminColorset()
{
$skin = Context::get('skin');
$type = Context::get('type') == 'M' ? 'M' : 'P';
Context::set('type', $type);
$dir = $type == 'P' ? 'skins' : 'm.skins';
if(!$skin)
{
$tpl = '';
}
else
{
$oModuleModel = getModel('module'); /* @var $oModuleModel moduleModel */
$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin, $dir);
Context::set('skin_info', $skin_info);
$config = $oModuleModel->getModuleConfig('message');
Context::set('config', $config);
$oTemplate = TemplateHandler::getInstance();
$tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
}
$this->add('tpl', $tpl);
}
}