[Rt-commit] rt branch, 4.2/canonicalize-urls-in-feeds, updated. rt-4.0.4-303-g02c35c8

[? sunnavy]

The branch, 4.2/canonicalize-urls-in-feeds has been updated
       via  02c35c8a5af690e54846fb1f69bc3afb7f4e8eaf (commit)
      from  e28696f28299c69f670e43dda9251f39bdbf25be (commit)

Summary of changes:
 lib/RT/Interface/Web.pm                   |    6 +++---
 share/html/NoAuth/iCal/dhandler           |    2 +-
 share/html/Search/Elements/ResultsRSSView |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 02c35c8a5af690e54846fb1f69bc3afb7f4e8eaf
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Jan 17 01:52:13 2012 +0800

    GetWebURLFromENV is a bad name, change to GetWebURLFromRequest

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 3a33b36..3139e0d 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -744,14 +744,14 @@ sub SendSessionCookie {
     $HTML::Mason::Commands::r->err_headers_out->{'Set-Cookie'} = $cookie->as_string;
 }
 
-=head2 GetWebURLFromENV
+=head2 GetWebURLFromRequest
 
 People may use different web urls instead of C<$WebURL> in config.
 Return the web url current user is using.
 
 =cut
 
-sub GetWebURLFromENV {
+sub GetWebURLFromRequest {
 
     my $uri = URI->new( RT->Config->Get('WebURL') );
 
@@ -798,7 +798,7 @@ sub Redirect {
         && $uri->host eq $server_uri->host
         && $uri->port eq $server_uri->port )
     {
-        my $env_uri = URI->new(GetWebURLFromENV());
+        my $env_uri = URI->new(GetWebURLFromRequest());
         $uri->scheme($env_uri->scheme);
         $uri->host($env_uri->host);
         $uri->port($env_uri->port);
diff --git a/share/html/NoAuth/iCal/dhandler b/share/html/NoAuth/iCal/dhandler
index 8e480be..8879af4 100644
--- a/share/html/NoAuth/iCal/dhandler
+++ b/share/html/NoAuth/iCal/dhandler
@@ -99,7 +99,7 @@ while (my $t = $tickets->Next) {
         $url = RT->Config->Get('WebURL');
     }
     else {
-        $url = RT::Interface::Web::GetWebURLFromENV();
+        $url = RT::Interface::Web::GetWebURLFromRequest();
     }
 
     $_->add_properties(
diff --git a/share/html/Search/Elements/ResultsRSSView b/share/html/Search/Elements/ResultsRSSView
index 2137b41..a0ba3a4 100644
--- a/share/html/Search/Elements/ResultsRSSView
+++ b/share/html/Search/Elements/ResultsRSSView
@@ -109,7 +109,7 @@ $r->content_type('application/rss+xml');
             $url = RT->Config->Get('WebURL');
         }
         else {
-            $url = RT::Interface::Web::GetWebURLFromENV();
+            $url = RT::Interface::Web::GetWebURLFromRequest();
         }
 
         $rss->channel(

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