merge from branch luminous (version 1.5.4.2, ~r12561)

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

View file

@ -101,6 +101,8 @@
$layout_list[$item->layout][] = $item;
}
usort($layout_list, array($this, 'sortLayoutInstance'));
Context::set('layout_list', $layout_list);
$this->setTemplateFile('layout_all_instance_list');
@ -109,6 +111,22 @@
$security->encodeHTML('layout_list..');
}
/**
* Sort layout instance by layout name, instance name
*/
function sortLayoutInstance($a, $b)
{
$aTitle = strtolower($a['title']);
$bTitle = strtolower($b['title']);
if($aTitle == $bTitle)
{
return 0;
}
return ($aTitle < $bTitle) ? -1 : 1;
}
/**
* Display list of pc layout instance
* @return void|Object (void : success, Object : fail)