From 199b150f901a1c66ec0652762339fa20de8a276c Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 28 Apr 2006 17:26:21 +0000
Subject: [PATCH] [ 1475220 ] some 6.99 templates have double slashes

---
 lib/WebGUI/AdminConsole.pm              | 6 +++---
 lib/WebGUI/Asset/Template/Parser.pm     | 2 +-
 lib/WebGUI/Session/Icon.pm              | 2 +-
 lib/WebGUI/i18n/English/Macro_Extras.pm | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index 02497f5de..fccc2aea9 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -69,8 +69,8 @@ sub _formatFunction {
 	my $i18n = WebGUI::International->new($self->session);
 	return {
 		title=>$i18n->get($function->{title}{id}, $function->{title}{namespace}),
-		icon=>$self->session->config->get("extrasURL")."/adminConsole/".$function->{icon},
-		'icon.small'=>$self->session->config->get("extrasURL")."/adminConsole/small/".$function->{icon},
+		icon=>$self->session->url->extras("/adminConsole/".$function->{icon}),
+		'icon.small'=>$self->session->url->extras("adminConsole/small/".$function->{icon}),
 		url=>$url,
 		canUse=>$self->session->user->isInGroup($function->{group}),
 		isCurrentOpFunc=>($self->session->form->process("op") eq $function->{op} || $self->session->form->process("func") eq $function->{func})
@@ -123,7 +123,7 @@ sub getAdminConsoleParams {
 	return { 'title' => $i18n->get("admin console","AdminConsole"),
 		url => $self->session->url->page("op=adminConsole"),
 		canUse => $self->session->user->isInGroup("12"),
-		icon => $self->session->config->get("extrasURL")."/adminConsole/adminConsole.gif"
+		icon => $self->session->url->extras("adminConsole/adminConsole.gif")
 		};
 }
 
diff --git a/lib/WebGUI/Asset/Template/Parser.pm b/lib/WebGUI/Asset/Template/Parser.pm
index 27352e399..2a04b9f4a 100755
--- a/lib/WebGUI/Asset/Template/Parser.pm
+++ b/lib/WebGUI/Asset/Template/Parser.pm
@@ -37,7 +37,7 @@ sub addSessionVars {
 	# of 6.8.5.  Further use of session template vars is deprecated.
 	$vars->{"session.user.username"} = $self->session->user->username;
 	$vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek");
-	$vars->{"session.config.extrasurl"} = $self->session->config->get("extrasURL");
+	$vars->{"session.config.extrasurl"} = $self->session->url->extras();
 	$vars->{"session.var.adminOn"} = $self->session->var->isAdminOn;
 	$vars->{"session.setting.companyName"} = $self->session->setting->get("companyName");
 	$vars->{"session.setting.anonymousRegistration"} = $self->session->setting->get("anonymousRegistration");
diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm
index f7477ec9e..eefdb18bf 100644
--- a/lib/WebGUI/Session/Icon.pm
+++ b/lib/WebGUI/Session/Icon.pm
@@ -62,7 +62,7 @@ Returns the base URL for this user's toolbar icon set.
 
 sub getBaseURL {
 	my $self = shift;
-	my $url = $self->session->config->get("extrasURL").'/toolbar/';
+	my $url = $self->session->url->extras('toolbar/');
 	if ($self->session->user->profileField("toolbar") ne "useLanguageDefault") {
 		$url .= $self->session->user->profileField("toolbar");
 	} else {
diff --git a/lib/WebGUI/i18n/English/Macro_Extras.pm b/lib/WebGUI/i18n/English/Macro_Extras.pm
index 255ce526b..93d3db3f9 100644
--- a/lib/WebGUI/i18n/English/Macro_Extras.pm
+++ b/lib/WebGUI/i18n/English/Macro_Extras.pm
@@ -15,11 +15,11 @@ our $I18N = {
 	'extras body' => {
 		message => q|
 
-<b>&#94;Extras;</b><br>
+<b>&#94;Extras; or &#94;Extras(path/to/something/in/extras/folder);</b><br>
 Returns the path to the WebGUI "extras" folder, which contains things like WebGUI icons.
 <p>
 |,
-		lastUpdated => 1112466755,
+		lastUpdated => 1146245155,
 	},
 };