mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-22 14:13:03 +02:00
Code Issues Releases Wiki Activity

More Admin->Mail Fixes.

Browse Source
This commit is contained in:
Cameron
2014-10-11 12:54:16 -07:00
parent 5d894149bb
commit 4fca7b7f12
3 changed files with 1119 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_handlers/mail_manager_class.php
View File

@@ -262,8 +262,8 @@ class e107MailManager
$res[$f] = '';
}
}
// $array = new ArrayData;
$res['mail_other'] = e107::serialize($res1, TRUE); // Ready to write to DB
$res['mail_other'] = e107::serialize($res1,false); // Ready to write to DB
return $res;
}
@@ -348,8 +348,7 @@ class e107MailManager
}
if (isset($data['mail_target_info']) && is_array($data['mail_target_info']))
{
$array = new ArrayData;
$tmp = $array->WriteArray($data['mail_target_info'], TRUE);
$tmp = e107::serialize($data['mail_target_info'], TRUE);
$res['mail_target_info'] = $tmp;
}
return $res;
@@ -896,9 +895,10 @@ class e107MailManager
$this->checkDB(2); // Make sure we have a DB object to use
$dbData = $this->mailToDB($emailData, FALSE); // Convert array formats
// print_a($dbData);
// print_a($dbData);
if ($isNew)
if ($isNew === true)
{
unset($dbData['mail_source_id']); // Just in case - there are circumstances where might be set
$result = $this->db2->db_Insert('mail_content', array('data' => $dbData,