[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-233-g2465059

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  2465059f57ab2f2f58994478d8ed3021b3a1703e (commit)
      from  6aac8b0bf613c44fe75f348f62a93006ef9a890e (commit)

Summary of changes:
 share/html/Ticket/Display.html     |    2 +-
 share/html/m/_elements/ticket_list |    2 +-
 share/html/m/login                 |    2 +-
 share/html/m/logout                |    2 +-
 share/html/m/ticket/show           |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 2465059f57ab2f2f58994478d8ed3021b3a1703e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Oct 29 09:44:11 2010 -0400

    $WebURL already has a trailing slash so don't double it

diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index 5c52eb1..c8c5b27 100755
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -103,7 +103,7 @@ $m->callback( TicketObj => $TicketObj, ARGSRef => \%ARGS, CallbackName => 'Initi
 
 if ( ! $ARGS{'NoRedirect'} && RT::Interface::Web->MobileClient()) {
     $id ||= $TicketObj->id if $TicketObj;
-    RT::Interface::Web::Redirect(RT->Config->Get('WebURL').'/m/ticket/show?id='.$id);
+    RT::Interface::Web::Redirect(RT->Config->Get('WebURL').'m/ticket/show?id='.$id);
     $m->abort;
 }
 
diff --git a/share/html/m/_elements/ticket_list b/share/html/m/_elements/ticket_list
index 391870f..94ff547 100644
--- a/share/html/m/_elements/ticket_list
+++ b/share/html/m/_elements/ticket_list
@@ -72,7 +72,7 @@ if ( $order_by) {
 $collection->RedoSearch();
  
 if ($page > 1 && ! @{$collection->ItemsArrayRef||[]}) {
-    RT::Interface::Web::Redirect( RT->Config->Get('WebURL')."/m/tickets/search?page=".($page-1)."&query=".$query."&order=$order&order_by=$order_by");
+    RT::Interface::Web::Redirect( RT->Config->Get('WebURL')."m/tickets/search?page=".($page-1)."&query=".$query."&order=$order&order_by=$order_by");
 }
 
 </%init>
diff --git a/share/html/m/login b/share/html/m/login
index df53ce9..35f8907 100644
--- a/share/html/m/login
+++ b/share/html/m/login
@@ -70,7 +70,7 @@ unless (!defined($uri->scheme) || $uri->scheme eq 'http' || $uri->scheme eq 'htt
 
 # Make sure we're logging in to the same domain
 # You can get an undef authority with a relative uri like "index.html"
-my $uri_base_url = URI->new(RT->Config->Get('WebURL')."/m/");
+my $uri_base_url = URI->new(RT->Config->Get('WebURL')."m/");
 unless (!defined($uri->authority) || $uri->authority eq $uri_base_url->authority) {
     $form_action = $default_path;
 }
diff --git a/share/html/m/logout b/share/html/m/logout
index ff7f898..07e6b78 100644
--- a/share/html/m/logout
+++ b/share/html/m/logout
@@ -50,5 +50,5 @@ if (keys %session) {
     tied(%session)->delete;
     $session{'CurrentUser'} = RT::CurrentUser->new;
 }
-RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."/m");
+RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."m/");
 </%init>
diff --git a/share/html/m/ticket/show b/share/html/m/ticket/show
index 96e7512..dcba125 100644
--- a/share/html/m/ticket/show
+++ b/share/html/m/ticket/show
@@ -142,7 +142,7 @@ if (@Actions) {
     my $key = Digest::MD5::md5_hex( rand(1024) );
     push @{ $session{"Actions"}->{$key} ||= [] }, @Actions;
     $session{'i'}++;
-    my $url = RT->Config->Get('WebURL') . "/m/ticket/show?id=" . $Ticket->id . "&results=" . $key;
+    my $url = RT->Config->Get('WebURL') . "m/ticket/show?id=" . $Ticket->id . "&results=" . $key;
     $url .= '#' . $ARGS{Anchor} if $ARGS{Anchor};
     RT::Interface::Web::Redirect($url);
 }

-----------------------------------------------------------------------