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-03-17 11:11:51 +09:00
parent fc5a4be0d2 6927401c1d
commit ce74f3beb8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common.lib.php
View File

@ -2634,8 +2634,8 @@ function conv_date_format($format, $date, $add='')
// unescape nl 얻기
function conv_unescape_nl($str)
{
$search = array('\\r', '\\\n', '\\n', '\r');
$replace = array('', '\n', '\n', '');
$search = array('\\r', '\r', '\\n', '\n');
$replace = array('', '', "\n", "\n");
return str_replace($search, $replace, $str);
}