[Bps-public-commit] rt-extension-mobileui branch, master, updated. 0.94-1-gff2f5d6
Jesse Vincent
jesse at bestpractical.com
Mon Aug 9 09:37:20 EDT 2010
The branch, master has been updated
via ff2f5d6e1cc8ef035649553fe86fc854ecd78d0f (commit)
from 4540945ffbae6829eb7e3111a215e36ed5778773 (commit)
Summary of changes:
.../Ticket/Display.html/Initial | 2 +-
html/m/_elements/wrapper | 2 +-
html/m/login | 2 +-
html/m/logout | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
- Log -----------------------------------------------------------------
commit ff2f5d6e1cc8ef035649553fe86fc854ecd78d0f
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Aug 9 06:39:16 2010 -0700
Fix use of WebBaseURL to WebURL
diff --git a/html/Callbacks/RT-Extension-MobileUI/Ticket/Display.html/Initial b/html/Callbacks/RT-Extension-MobileUI/Ticket/Display.html/Initial
index 65873cb..129207f 100644
--- a/html/Callbacks/RT-Extension-MobileUI/Ticket/Display.html/Initial
+++ b/html/Callbacks/RT-Extension-MobileUI/Ticket/Display.html/Initial
@@ -1,7 +1,7 @@
<%INIT>
return if $ARGSRef->{'NoRedirect'};
if (RT::Extension::MobileUI::MobileClient()) {
- RT::Interface::Web::Redirect(RT->Config->Get('WebBaseURL').'/m/ticket/show.html?id='.$TicketObj->id);
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL').'/m/ticket/show.html?id='.$TicketObj->id);
$m->abort;
}
</%INIT>
diff --git a/html/m/_elements/wrapper b/html/m/_elements/wrapper
index 6760aa4..794385d 100644
--- a/html/m/_elements/wrapper
+++ b/html/m/_elements/wrapper
@@ -5,7 +5,7 @@ $show_home_button => 1
<%init>
if ($m->request_args->{'NotMobile'}) {
$session{'NotMobile'} = 1;
- RT::Interface::Web::Redirect(RT->Config->Get('WebBaseURL'));
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL'));
$m->abort();
}
$m->comp('header', title => $title, show_home_button => $show_home_button);
diff --git a/html/m/login b/html/m/login
index 0a246bf..3688749 100644
--- a/html/m/login
+++ b/html/m/login
@@ -23,7 +23,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('WebBaseURL')."/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/html/m/logout b/html/m/logout
index 02bee7d..78878a3 100644
--- a/html/m/logout
+++ b/html/m/logout
@@ -3,5 +3,5 @@ if (keys %session) {
tied(%session)->delete;
$session{'CurrentUser'} = RT::CurrentUser->new;
}
-RT::Interface::Web::Redirect(RT->Config->Get('WebBaseURL')."/m");
+RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."/m");
</%init>
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list