Merge branch 'g5'

This commit is contained in:
chicpro
2013-11-18 13:49:37 +09:00
2 changed files with 3 additions and 10 deletions

View File

@ -98,15 +98,8 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'">처음</a>'; //페이지 처음
$referer = get_text(cut_str($row[vi_referer], 255, "")); $referer = get_text(cut_str($row[vi_referer], 255, ""));
$referer = urldecode($referer); $referer = urldecode($referer);
if (strtolower($g4['charset']) == 'utf-8') { if (!is_utf8($referer)) {
if (!is_utf8($referer)) { $referer = iconv('euc-kr', 'utf-8', $referer);
$referer = iconv('euc-kr', 'utf-8', $referer);
}
}
else {
if (is_utf8($referer)) {
$referer = iconv('utf-8', 'euc-kr', $referer);
}
} }
$title = str_replace(array("<", ">"), array("&lt;", "&gt;"), $referer); $title = str_replace(array("<", ">"), array("&lt;", "&gt;"), $referer);

View File

@ -11,7 +11,7 @@ $text_stx = "";
$srows = 0; $srows = 0;
$stx = strip_tags($stx); $stx = strip_tags($stx);
$stx = preg_replace('/[[:punct:]]/', '', $stx); // 특수문자 제거 $stx = preg_replace('/[[:punct:]]/u', '', $stx); // 특수문자 제거
if ($stx) { if ($stx) {
$stx = preg_replace('/\//', '\/', trim($stx)); $stx = preg_replace('/\//', '\/', trim($stx));
$sop = strtolower($sop); $sop = strtolower($sop);