Merge commit 'upstream/master'

Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index 90998457..7bc21a67 100644
--- a/modules/gallery/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
@@ -52,6 +52,7 @@ class Sendmail_Core {
       break;
     case  "header":
       if (count($value) != 2) {
+        Kohana::log("error", wordwrap("Invalid header parameters\n" . Kohana::debug($value)));
         throw new Exception("@todo INVALID_HEADER_PARAMETERS");
       }
       $this->headers[$value[0]] = $value[1];
@@ -70,6 +71,7 @@ class Sendmail_Core {
 
   public function send() {
     if (empty($this->to)) {
+      Kohana::log("error", wordwrap("Sending mail failed:\nNo to address specified"));
       throw new Exception("@todo TO_IS_REQUIRED_FOR_MAIL");
     }
     $to = implode(", ", $this->to);
@@ -84,8 +86,6 @@ class Sendmail_Core {
     $headers = implode($this->header_separator, $headers);
     $message = wordwrap($this->message, $this->line_length, "\n");
     if (!$this->mail($to, $this->subject, $message, $headers)) {
-      Kohana::log("error", wordwrap("Sending mail failed:\nTo: $to\n $this->subject\n" .
-                                    "Headers: $headers\n $this->message"));
       throw new Exception("@todo SEND_MAIL_FAILED");
     }
     return $this;