[Rt-commit] r7678 - in rt/branches/3.7-EXPERIMENTAL: . html/Search lib/RT/Interface

[jesse at bestpractical.com]

Author: jesse
Date: Tue Apr 24 14:32:01 2007
New Revision: 7678

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Search/Simple.html
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email.pm
   rt/branches/3.7-EXPERIMENTAL/lib/t/regression/23-web_attachments.t
   rt/branches/3.7-EXPERIMENTAL/lib/t/regression/26command_line.t

Log:
 r56018 at pinglin:  root | 2007-04-24 14:05:18 -0400
 * merge cleanup


Modified: rt/branches/3.7-EXPERIMENTAL/html/Search/Simple.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Search/Simple.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Search/Simple.html	Tue Apr 24 14:32:01 2007
@@ -72,7 +72,10 @@
 
 if ($q) {
     my $tickets = new RT::Tickets( $session{'CurrentUser'} );
-    
+    if ($q =~ /^(\d+)$/) {
+        RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."/Ticket/Display.html?id=".$q);
+    }
+
     $m->callback( %ARGS, query => \$q, CallbackName => 'ModifyQuery' );
     
     my $search  = RT::Search::Googleish->new(Argument   => $q,

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Interface/Email.pm	Tue Apr 24 14:32:01 2007
@@ -1240,7 +1240,7 @@
     );
 
     # Also notify the requestor that his request has been dropped.
-    if ($args{'Requestor'} ne $RT::OwnerEmail) {
+    if ($args{'Requestor'} ne RT->Config->Get('OwnerEmail')) {
     MailError(
         To          => $args{'Requestor'},
         Subject     => "Could not load a valid user",
@@ -1307,7 +1307,7 @@
         }
 
         #Do we actually want to store it?
-        return ( 0, $ErrorsTo, "Message Bounced", $IsALoop ) unless ($RT::StoreLoops);
+        return ( 0, $ErrorsTo, "Message Bounced", $IsALoop ) unless (RT->Config->Get('StoreLoops'));
     }
 
     # Squelch replies if necessary

Modified: rt/branches/3.7-EXPERIMENTAL/lib/t/regression/23-web_attachments.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/t/regression/23-web_attachments.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/t/regression/23-web_attachments.t	Tue Apr 24 14:32:01 2007
@@ -7,8 +7,7 @@
 RT::Init;
 use Test::WWW::Mechanize;
 
-$RT::WebURL ||= 0; # avoid stupid warning
-my $BaseURL = $RT::WebURL;
+my $BaseURL = RT->Config->Get('WebURL');
 use constant LogoFile => $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
 use constant FaviconFile => $RT::MasonComponentRoot .'/NoAuth/images/favicon.png';
 

Modified: rt/branches/3.7-EXPERIMENTAL/lib/t/regression/26command_line.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/t/regression/26command_line.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/t/regression/26command_line.t	Tue Apr 24 14:32:01 2007
@@ -35,8 +35,8 @@
 #    - RTPASSWD
 $ENV{'RTPASSWD'} = 'password';
 #    - RTSERVER
-$RT::Logger->debug("Connecting to server at $RT::WebBaseURL...");
-$ENV{'RTSERVER'} = $RT::WebBaseURL;
+$RT::Logger->debug("Connecting to server at ".RT->Config->Get('WebBaseURL'));
+$ENV{'RTSERVER'} =RT->Config->Get('WebBaseURL') ;
 #    - RTDEBUG       Numeric debug level. (Set to 3 for full logs.)
 $ENV{'RTDEBUG'} = '1';
 #    - RTCONFIG      Specifies a name other than ".rtrc" for the