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

merge from branch 1.5.0 (~r10881)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10882 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-13 03:05:31 +00:00
commit b0dfc0de0f
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/admin/tpl/js/admin.js
View file

@ -1240,7 +1240,7 @@ jQuery(function($){
$(this).append($sTog); $(this).append($sTog);
$sTog.click(function(){ $sTog.click(function(){
var $t = $(this); var $t = $(this);
var $sTogObj = $t.parent().nextUntil('.h2, .h3'); var $sTogObj = $t.parent().nextUntil('.h2, .h3').not('.langEdit, .tgContent, .modal');
if($t.parent().next().is(':hidden')){ if($t.parent().next().is(':hidden')){
$t.find('i').attr('class','icon-chevron-up'); $t.find('i').attr('class','icon-chevron-up');
$sTogObj.slideDown(200); $sTogObj.slideDown(200);

2
modules/admin/tpl/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -101,7 +101,7 @@
} }
if($output->toBool() && $output->data && $vid) { if($output->toBool() && $output->data && $vid) {
Context::set('vid', $output->data->domain, true); Context::set('vid', $output->data->domain, true);
if(strtolower($mid)==strtolower($output->data->domain)) Context::set('mid',$output->data->mid,true); if($mid==$output->data->domain) Context::set('mid',$output->data->mid,true);
} }
if(!$output || !$output->data) { $domain = ''; unset($output); } if(!$output || !$output->data) { $domain = ''; unset($output); }
} }