[Jifty-commit] r4424 - in jifty/trunk: .

[jifty-commit at lists.jifty.org]

Author: chapman
Date: Tue Nov 13 11:53:51 2007
New Revision: 4424

Modified:
   jifty/trunk/AUTHORS
   jifty/trunk/lib/Jifty/Plugin/Feedback/Action/SendFeedback.pm

Log:
Fixed the feedback plugin so it works even if the current
user doesn't have permission to read their own email.


Modified: jifty/trunk/AUTHORS
==============================================================================
--- jifty/trunk/AUTHORS	(original)
+++ jifty/trunk/AUTHORS	Tue Nov 13 11:53:51 2007
@@ -33,3 +33,4 @@
 Shawn M Moore <sartak at gmail.com>
 Edward Funnekotter <efunneko at gmail.com>
 Cornelius Lin <c9s at aiink.com>
+Todd Chapman <todd at chaka.net>

Modified: jifty/trunk/lib/Jifty/Plugin/Feedback/Action/SendFeedback.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Feedback/Action/SendFeedback.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Feedback/Action/SendFeedback.pm	Tue Nov 13 11:53:51 2007
@@ -58,13 +58,19 @@
     # Fall back to normal email
     my $mail = Jifty::Notification->new;
     $mail->body($msg);
-    $mail->from(
-        (          Jifty->web->current_user->id
-                && Jifty->web->current_user->user_object->can('email')
-        )
-        ? Jifty->web->current_user->user_object->email()
-        : $plugin->from
-    );
+
+    if (    Jifty->web->current_user->id
+         && Jifty->web->current_user->user_object->can('email') ) {
+
+         my $user = Jifty->web->current_user->user_object;
+         my $CurrentUser = Jifty->app_class('CurrentUser');
+         $user->current_user( $CurrentUser->superuser );
+         $mail->from( $user->email() || $plugin->from );
+    }
+    else {
+        $mail->from( $plugin->from );
+    }
+
     $mail->recipients( $plugin->to );
     $mail->subject( "["
             . Jifty->config->framework('ApplicationName')