Merge branch 'g5'

lib/common.lib.php

@@ -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);
 }