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

merger from branch luminous (~r11576)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11580 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-10-04 05:04:23 +00:00
commit 51bb8d1985
91 changed files with 1157 additions and 703 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/module/module.admin.controller.php
View file

@ -643,6 +643,7 @@
// Variable setting for site keyword
$site_keyword = Context::get('site_keyword');
$site_srl = Context::get('site_srl');
$vid = Context::get('vid');
// If there is no site keyword, use as information of the current virtual site
$args = null;
$logged_info = Context::get('logged_info');
@ -651,7 +652,7 @@
if(!$site_srl)
{
if($logged_info->is_admin == 'Y' && !$site_keyword) $args->site_srl = 0;
if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
else $args->site_srl = (int)$site_module_info->site_srl;
}
else $args->site_srl = $site_srl;

5
modules/module/module.model.php
View file

@ -151,6 +151,11 @@
* @brief Get module information by mid
**/
function getModuleInfoByMid($mid, $site_srl = 0, $columnList = array()) {
if(!$mid)
{
return;
}
$args->mid = $mid;
$args->site_srl = (int)$site_srl;
$oCacheHandler = &CacheHandler::getInstance('object');

2
modules/module/tpl/skin_config.html
View file

@ -100,7 +100,7 @@
</p>
<p cond="$val->type == 'checkbox'" class="a">
<span loop="$val->options => $k, $v">
<input type="checkbox" name="{$val->name}[]" value="{$v->value}" id="ch_{$key}_{$k}" checked="checked"|cond="in_array($v->value, $val->value)" class="checkbox" />
<input type="checkbox" name="{$val->name}[]" value="{$v->value}" id="ch_{$key}_{$k}" checked="checked"|cond="@in_array($v->value, $val->value)" class="checkbox" />
<label for="ch_{$key}_{$k}">{$v->title}</label>
</span>
</p>