[Rt-commit] [rtir] 01/01: Fix a few places where RTIR used Mason's redirect

[Jesse Vincent]

This is an automated email from the git hooks/post-receive script.

jesse pushed a commit to branch 3.2/use-rt-redirect
in repository rtir.

commit a0595364a4129b7b6e4d9a1a355e337950d2a6a1
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Feb 18 17:18:28 2015 -0800

    Fix a few places where RTIR used Mason's redirect
    
    Mason's redirect doesn't do all of the work RT needs to operate
    correctly, particularly if you're running RT on a nonstandard port
    for development
---
 html/RTIR/Reporting/index.html         | 2 +-
 html/RTIR/Search/Elements/ProcessQuery | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/html/RTIR/Reporting/index.html b/html/RTIR/Reporting/index.html
index 1766923..31059c1 100644
--- a/html/RTIR/Reporting/index.html
+++ b/html/RTIR/Reporting/index.html
@@ -114,7 +114,7 @@ if ( $ARGS{'HTMLReport'} || $ARGS{'TextReport'} || $ARGS{'SpreadsheetReport'} )
     $ext = 'tsv' if $ARGS{'SpreadsheetReport'};
     my $url = RT->Config->Get('WebURL') .'RTIR/Reporting/Report.'. $ext;
     $url   .= "?". $m->comp( '/Elements/QueryString', %ARGS );
-    $m->redirect($url);
+    return RT::Interface::Web::Redirect($url);
 }
 
 my $now = RT::Date->new(RT->SystemUser);
diff --git a/html/RTIR/Search/Elements/ProcessQuery b/html/RTIR/Search/Elements/ProcessQuery
index df621f4..27cf447 100644
--- a/html/RTIR/Search/Elements/ProcessQuery
+++ b/html/RTIR/Search/Elements/ProcessQuery
@@ -238,8 +238,7 @@ $session{'CurrentSearchHash'} = {
 if ( $ARGS{"DoSearch"} ) {
     $ResultPage .= $ResultPage =~ /\?/? '&': '?';
     $ResultPage .= $m->comp('/Elements/QueryString', %query );
-    $m->redirect( RT->Config->Get('WebURL') . $ResultPage );
-    $m->abort();
+    return RT::Interface::Web::Redirect( RT->Config->Get('WebURL') . $ResultPage );
 }
 # }}}
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.