Merge branch 'g5'
This commit is contained in:
@ -55,6 +55,7 @@ if(is_file($skin_file)) {
|
||||
$faq_list = array();
|
||||
|
||||
$stx = trim($stx);
|
||||
$sql_search = '';
|
||||
|
||||
if($stx) {
|
||||
$sql_search = " and ( INSTR(fa_subject, '$stx') > 0 or INSTR(fa_content, '$stx') > 0 ) ";
|
||||
|
||||
@ -149,6 +149,7 @@ if (!$sst) {
|
||||
$sst = preg_match("/^(wr_datetime|wr_hit|wr_good|wr_nogood)$/i", $sst) ? $sst : "";
|
||||
}
|
||||
|
||||
$sql_order = '';
|
||||
if ($sst) {
|
||||
$sql_order = " order by {$sst} {$sod} ";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user