summaryrefslogtreecommitdiff
path: root/modules/gallery/libraries/Sendmail.php
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-09-17 20:23:05 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-09-17 20:23:05 +0000
commit7a5de04e51daa102840a02af6b9ce8138d08c4bb (patch)
treea3f8bcb9ac961523b4835b8865c152c8835f25e7 /modules/gallery/libraries/Sendmail.php
parentf96a75f2b13a0bd7a37b320aa5655f67868ca80d (diff)
parent3e1743b21fd35b9d6d540e827292f1f4f006b531 (diff)
Pulled latest source from upstream.
Diffstat (limited to 'modules/gallery/libraries/Sendmail.php')
-rw-r--r--modules/gallery/libraries/Sendmail.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/gallery/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index 0fa554b4..a93be736 100644
--- a/modules/gallery/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
@@ -35,12 +35,11 @@ class Sendmail_Core {
public function __construct() {
$this->headers = array();
- $domain = Input::instance()->server("HTTP_HOST");
- $this->from(module::get_var("gallery", "email_from", "admin@$domain"));
- $this->reply_to(module::get_var("gallery", "email_reply_to", "public@$domain"));
+ $this->from(module::get_var("gallery", "email_from", ""));
+ $this->reply_to(module::get_var("gallery", "email_reply_to", ""));
$this->line_length(module::get_var("gallery", "email_line_length", 70));
$separator = module::get_var("gallery", "email_header_separator", null);
- $this->header_separator(empty($separator) ? "\n" : deserialize($separator));
+ $this->header_separator(empty($separator) ? "\n" : unserialize($separator));
}
public function __get($key) {