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

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2014-12-05 17:13:49 +09:00
parent e687abc338 fe35a8c782
commit 49bdbadc4a
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bbs/faq.php
View File

@ -55,6 +55,7 @@ if(is_file($skin_file)) {
$faq_list = array(); $faq_list = array();
$stx = trim($stx); $stx = trim($stx);
$sql_search = '';
if($stx) { if($stx) {
$sql_search = " and ( INSTR(fa_subject, '$stx') > 0 or INSTR(fa_content, '$stx') > 0 ) "; $sql_search = " and ( INSTR(fa_subject, '$stx') > 0 or INSTR(fa_content, '$stx') > 0 ) ";

1
bbs/list.php
View File

@ -149,6 +149,7 @@ if (!$sst) {
$sst = preg_match("/^(wr_datetime|wr_hit|wr_good|wr_nogood)$/i", $sst) ? $sst : ""; $sst = preg_match("/^(wr_datetime|wr_hit|wr_good|wr_nogood)$/i", $sst) ? $sst : "";
} }
$sql_order = '';
if ($sst) { if ($sst) {
$sql_order = " order by {$sst} {$sod} "; $sql_order = " order by {$sst} {$sod} ";
} }