Merge from 1.5.2.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10519 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-02 09:30:09 +00:00
parent 9bf08cf3df
commit 361cd64c16
86 changed files with 804 additions and 156 deletions

View file

@ -91,12 +91,12 @@
}
if(!$sort_order) {
$sort_order = 'desc';
$sort_order = 'asc';
}
if($sort_order != 'desc')
if($sort_order != 'asc')
{
$sort_order = 'asc';
$sort_order = 'desc';
}
if($args->selected_group_srl) {

View file

@ -171,6 +171,12 @@
</form>
<form action="" method="post">
<input type="hidden" name="module" value="{$module}" />
<select name="selected_group_srl">
<option value="0">그룹 전체</option>
<!--@foreach($group_list as $key => $val)-->
<option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
<!--@end-->
</select>
<select name="search_target">
<option value="">{$lang->search_target}</option>
{@$lang->search_target_list = array_merge($lang->search_target_list, $usedIdentifiers)}