Manually merged changes to .htaccess file resolving conflicts due to my changes of the file.

1 files changed, 6 insertions, 4 deletions

diff --git a/modules/gallery/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index ded7b2ef..0fa554b4 100644
--- a/modules/gallery/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
@@ -35,10 +35,12 @@ class Sendmail_Core {
 
   public function __construct() {
     $this->headers = array();
-    $config = Kohana::config("sendmail");
-    foreach ($config as $key => $value) {
-      $this->$key($value);
-    }
+    $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->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));
   }
 
   public function __get($key) {