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

2
adm/mail_select_list.php
View File

@ -94,7 +94,7 @@ include_once('./admin.head.php');
while ($row=sql_fetch_array($result)) {
$i++;
$ma_list .= $cr . $row['mb_email'] . "||" . $row['mb_id'] . "||" . $row['mb_name'] . "||" . $row['mb_nick'] . "||" . $row['mb_datetime'];
$cr = '\n';
$cr = "\n";
$bg = 'bg'.($i%2);
?>

2
adm/mail_select_update.php
View File

@ -36,7 +36,7 @@ $ma_id = trim($_POST['ma_id']);
$select_member_list = trim($_POST['ma_list']);
//print_r2($_POST); EXIT;
$member_list = explode('\n', conv_unescape_nl($select_member_list));
$member_list = explode("\n", conv_unescape_nl($select_member_list));
// 메일내용 가져오기
$sql = "select ma_subject, ma_content from {$g5['mail_table']} where ma_id = '$ma_id' ";

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