2 files changed, 17 insertions, 10 deletions
diff --git a/rt/lib/RT/Action/SetWillResolve.pm b/rt/lib/RT/Action/SetWillResolve.pm
index 807b3c64c..2f9f6190f 100644
--- a/rt/lib/RT/Action/SetWillResolve.pm
+++ b/rt/lib/RT/Action/SetWillResolve.pm
@@ -8,18 +8,26 @@ sub Describe  {
   return (ref $self ." will set a ticket's future resolve date to the argument.");
 }
 
-sub Prepare  {
-    return 1;
+sub Prepare {
+    my $self = shift;
+    my $DateObj = RT::Date->new( $self->CurrentUser );
+    if ( length($self->Argument) ) {
+        $DateObj->Set(
+            Format => 'unknown',
+            Value  => $self->Argument
+        )
+    }
+    else { # special case: treat Argument => '' as "never"
+        $DateObj->Unix(-1);
+    }
+    $self->{new_value} = $DateObj->ISO;
+    # if the before and after values are string-equivalent, don't bother
+    return ($DateObj->AsString ne $self->TicketObj->WillResolveAsString);
 }
 
 sub Commit {
     my $self = shift;
-    my $DateObj = RT::Date->new( $self->CurrentUser );
-    $DateObj->Set(
-      Format => 'unknown', 
-      Value  => $self->Argument,
-    );
-    $self->TicketObj->SetWillResolve( $DateObj->ISO );
+    $self->TicketObj->SetWillResolve( $self->{new_value} );
 }
 
 RT::Base->_ImportOverlays();
diff --git a/rt/lib/RT/URI/freeside/Internal.pm b/rt/lib/RT/URI/freeside/Internal.pm
index 6d3adc2ef..9c9700032 100644
--- a/rt/lib/RT/URI/freeside/Internal.pm
+++ b/rt/lib/RT/URI/freeside/Internal.pm
@@ -26,14 +26,13 @@
 # END LICENSE BLOCK
 #
 use strict;
-no warnings qw(redefine);
 
 #use vars qw($conf);
 
 use FS;
 use FS::UID qw(dbh);
 use FS::CGI qw(popurl);
-use FS::UI::Web::small_custview qw(small_custview);
+use FS::UI::Web::small_custview;
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch dbdef);
 use FS::cust_main;