firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

충돌 해결

Browse Source
This commit is contained in:
gnuboard
2013-09-12 11:47:02 +09:00
parent 0cfc29896f
commit 9001aa1b37
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adm/shop_admin/orderlist.php
View File

@ -63,15 +63,11 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산
if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
$from_record = ($page - 1) * $rows; // 시작 열을 구함 $from_record = ($page - 1) * $rows; // 시작 열을 구함
<<<<<<< HEAD
$sql = " select * $sql = " select *
$sql_common $sql_common
order by $sort1 $sort2 order by $sort1 $sort2
limit $from_record, $rows "; limit $from_record, $rows ";
======= $result = sql_query($sql);
$sql = " select *, "._MISU_QUERY_." $sql_common order by $sort1 $sort2 limit $from_record, $rows ";
>>>>>>> itemskin
$result = sql_query($sql, false);
$qstr1 = "sel_field=$sel_field&amp;search=$search&amp;save_search=$search"; $qstr1 = "sel_field=$sel_field&amp;search=$search&amp;save_search=$search";
$qstr = "$qstr1&amp;sort1=$sort1&amp;sort2=$sort2&amp;page=$page"; $qstr = "$qstr1&amp;sort1=$sort1&amp;sort2=$sort2&amp;page=$page";