From 713d94221f2c078c91e61315e9c90197ab539a15 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 1 Jul 2003 02:57:41 +0000
Subject: [PATCH] changes to get closer to XHTML 1.0 compiance

---
 lib/WebGUI/Navigation.pm |  2 +-
 lib/WebGUI/Style.pm      | 16 ++++++++--------
 lib/WebGUI/URL.pm        |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/WebGUI/Navigation.pm b/lib/WebGUI/Navigation.pm
index 58d5f3e71..6e25570f8 100644
--- a/lib/WebGUI/Navigation.pm
+++ b/lib/WebGUI/Navigation.pm
@@ -135,7 +135,7 @@ sub drawVertical {
                 $padding .= "&nbsp;&nbsp;&nbsp;";
         }
         for ($i=1;$i<=$spacing;$i++) {
-                $leading .= "<br>";
+                $leading .= "<br />";
         }
 	foreach $pageId (keys %{$tree}) {
 		$output .= $padding.$bullet.'<a class="'.$class.'"';
diff --git a/lib/WebGUI/Style.pm b/lib/WebGUI/Style.pm
index 14edb8635..d3424d428 100644
--- a/lib/WebGUI/Style.pm
+++ b/lib/WebGUI/Style.pm
@@ -65,20 +65,20 @@ sub get {
 	my $type = lc($session{setting}{siteicon});
         $type =~ s/.*\.(.*?)$/$1/;
         $header .= '</title>
-		<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset='.($session{header}{charset}||$session{language}{characterSet}||"ISO-8859-1").'">
-		<link REL="icon" HREF="'.$session{setting}{siteicon}.'" TYPE="image/'.$type.'">
-		<LINK REL="SHORTCUT ICON" HREF="'.$session{setting}{favicon}.'">
+		<meta http-equiv="Content-Type" content="text/html; charset='.($session{header}{charset}||$session{language}{characterSet}||"ISO-8859-1").'" />
+		<link rel="icon" href="'.$session{setting}{siteicon}.'" type="image/'.$type.'" />
+		<link rel="SHORTCUT ICON" href="'.$session{setting}{favicon}.'" />
 	'.$style{styleSheet}.$session{page}{metaTags};
         if ($session{var}{adminOn}) {
                 # This "triple incantation" panders to the delicate tastes of various browsers for reliable cache suppression.
-                $header .= '<META HTTP-EQUIV="Pragma" CONTENT="no-cache">';
-                $header .= '<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate, max_age=0">';
-                $header .= '<META HTTP-EQUIV="Expires" CONTENT="0">';
+                $header .= '<meta http-equiv="Pragma" content="no-cache" />';
+                $header .= '<meta http-equiv="Cache-Control" content="no-cache, must-revalidate, max_age=0" />';
+                $header .= '<meta http-equiv="Expires" content="0" />';
         }
         if ($session{page}{defaultMetaTags}) {
                 $header .= '<meta http-equiv="Keywords" name="Keywords" content="'.$session{page}{title}
-                        .', '.$session{setting}{companyName}.'">';
-                $header .= '<meta http-equiv="Description" name="Description" content="'.$session{page}{synopsis}.'">';
+                        .', '.$session{setting}{companyName}.'" />';
+                $header .= '<meta http-equiv="Description" name="Description" content="'.$session{page}{synopsis}.'" />';
 
         }
         $header .= '</head>'.$body[0];
diff --git a/lib/WebGUI/URL.pm b/lib/WebGUI/URL.pm
index 7d5b9661e..bf56b5460 100644
--- a/lib/WebGUI/URL.pm
+++ b/lib/WebGUI/URL.pm
@@ -87,7 +87,7 @@ sub append {
 	my ($url);
 	$url = $_[0];
 	if ($url =~ /\?/) {
-		$url .= '&'.$_[1];
+		$url .= '&amp;'.$_[1];
 	} else {
 		$url .= '?'.$_[1];
 	}