From 5ced1c3bcf805c432b6ece0e222352e55dc8fc1b Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 12 Jul 2010 10:43:33 -0700
Subject: [PATCH] Note in several packages when the gateway URL is appended to
 input.  Fixes bug #11621

---
 docs/changelog/7.x.x.txt          | 1 +
 lib/WebGUI/AssetAspect/RssFeed.pm | 3 ++-
 lib/WebGUI/AssetExportHtml.pm     | 2 +-
 lib/WebGUI/Session/Icon.pm        | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index d432cd111..bb93deca6 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -8,6 +8,7 @@
  - fixed #11709: Shop - i18n error
  - fixed #11710: Weird license in json.js might be taken as non free
  - fixed #11708: Activity DeleteExpiredSessions is too slow
+ - fixed #11621: Documentation Error: Methods that accept URLs should indicate whether or not to include Gateway
 
 7.9.8
  - fixed #11651: First Day of Week is a string...
diff --git a/lib/WebGUI/AssetAspect/RssFeed.pm b/lib/WebGUI/AssetAspect/RssFeed.pm
index 85e8db41f..8818f70a7 100644
--- a/lib/WebGUI/AssetAspect/RssFeed.pm
+++ b/lib/WebGUI/AssetAspect/RssFeed.pm
@@ -338,7 +338,8 @@ sub _getFeedUrl {
 
 =head2 _getStaticFeedUrl ($extension)
 
-Generic method for returning the static URL for a type of feed.
+Generic method for returning the static URL for a type of feed.  The returned URL will be complete,
+and absolute, containing the gateway URL for this site.
 
 =head3 $extension
 
diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm
index 4c065af0f..edc634760 100644
--- a/lib/WebGUI/AssetExportHtml.pm
+++ b/lib/WebGUI/AssetExportHtml.pm
@@ -563,7 +563,7 @@ sub exportGetDescendants {
 
 =head2 exportGetUrlAsPath ( index )
 
-Translates a URL into an appropriate path and filename for exporting. For
+Translates an asset's URL into an appropriate path and filename for exporting. For
 example, given C<'/foo/bar/baz'>, will return C<'/foo/bar/baz/index.html'>
 provided the value of indexFile as given to exportAsHtml was C<'index.html'>.
 
diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm
index 617b7e153..998780a30 100644
--- a/lib/WebGUI/Session/Icon.pm
+++ b/lib/WebGUI/Session/Icon.pm
@@ -155,7 +155,9 @@ Any URL parameters that need to be tacked on to the current URL to accomplish wh
 
 =head3 pageURL
 
-The URL to any page. Defaults to the current page.
+The URL to any page. Defaults to the current page.  If a URL is passed, the gateway URL from the site's config
+file will be prepended to it.
+
 
 =head3 confirmText