fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-16 17:59:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from branch luminous (version 1.5.4.2, ~r12561)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/autoinstall/autoinstall.admin.view.php
View file

@ -259,10 +259,23 @@
$res = array();
foreach($package_list as $package_srl => $package)
{
$res[] = $item_list[$package_srl];
if($item_list[$package_srl])
{
$res[] = $item_list[$package_srl];
}
}
Context::set('item_list', $res);
}
if(count($package_list) != count($res))
{
$localPackageSrls = array_keys($package_list);
$remotePackageSrls = array_keys($item_list);
$targetPackageSrls = array_diff($localPackageSrls, $remotePackageSrls);
$countDiff = count($targetPackageSrls);
$output->page_navigation->total_count -= $countDiff;
}
Context::set('page_navigation', $output->page_navigation);
$this->setTemplateFile('index');