projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import rt 3.6.4
[freeside.git]
/
rt
/
lib
/
RT
/
Interface
/
Email
/
Auth
/
MailFrom.pm
diff --git
a/rt/lib/RT/Interface/Email/Auth/MailFrom.pm
b/rt/lib/RT/Interface/Email/Auth/MailFrom.pm
index
ef315dd
..
32009c3
100644
(file)
--- a/
rt/lib/RT/Interface/Email/Auth/MailFrom.pm
+++ b/
rt/lib/RT/Interface/Email/Auth/MailFrom.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-200
5
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-200
7
Best Practical Solutions, LLC
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-22,7
+22,9
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/copyleft/gpl.html.
#
#
# CONTRIBUTION SUBMISSION POLICY:
#
#
# CONTRIBUTION SUBMISSION POLICY:
@@
-60,6
+62,11
@@
sub GetCurrentUser {
# We don't need to do any external lookups
my ( $Address, $Name ) = ParseSenderAddressFromHead( $args{'Message'}->head );
# We don't need to do any external lookups
my ( $Address, $Name ) = ParseSenderAddressFromHead( $args{'Message'}->head );
+
+ unless ($Address) {
+ return ( $args{'CurrentUser'}, -1 );
+ }
+
my $CurrentUser = RT::CurrentUser->new();
$CurrentUser->LoadByEmail($Address);
my $CurrentUser = RT::CurrentUser->new();
$CurrentUser->LoadByEmail($Address);