fixed a few bugs

docs/changelog/6.x.x.txt

@@ -81,6 +81,9 @@
  - Replaced Date::Calc with Date::Manip to allow for dates before 1970 and
    after 2035. (Emiliano Bruni)
  - Added Date::Manip to the WebGUI distribution.
+ - bugfix [ 1013370 ] tag </body> appears twice (Vladimir Kondratiev).
+ - bugfix [ 1016258 ] Empty Trash Typo (Tavis Parker).
+ - bugfix [ 1017727 ] Redirect URL (on edit page) not redirecting
  - RFE [ 718739 ]. USS Submission Start/End Dates (Thanks to Roy Johnson).
 
 

lib/WebGUI.pm

@@ -120,6 +120,7 @@ sub page {
 	my $output = _processOperations();
 	if ($output ne "") {
 		$output = _generatePage($output);
+        	$output = WebGUI::HTTP::getHeader().$output;
 	} else {
         	my $useCache = (
 			$session{form}{op} eq "" && 
@@ -153,18 +154,16 @@ sub page {
 			} else {
 				$ttl = $session{page}{cacheTimeout};
 			}
+        		$output = WebGUI::HTTP::getHeader().$output;
 			$cache->set($output, $ttl) if ($useCache);
 			WebGUI::PassiveProfiling::addPage();	# add wobjects on page to passive profile log
 		}
 	}
 	WebGUI::Affiliate::grabReferral();	# process affilliate tracking request
-        my $httpHeader = WebGUI::HTTP::getHeader();
 	# This allows an operation or wobject to write directly to the browser.
-        if ($session{page}{empty}) {
-		$httpHeader = $output = undef;
-        }
+	$output = undef if ($session{page}{empty});
 	WebGUI::Session::close() unless ($useExistingSession);
-	return $httpHeader.$output;
+	return $output;
 }
 
 

lib/WebGUI/Session.pm

@@ -128,7 +128,7 @@ sub _setupUserInfo {
 
 #-------------------------------------------------------------------
 sub _time {
-	return &UnixDate(&ParseDate("now")),"%s");
+	return &UnixDate(&ParseDate("now"),"%s");
 }
 
 

lib/WebGUI/i18n/English/WebGUI.pm

@@ -3838,8 +3838,8 @@ The primary URL of your company. This will appear on all automated emails sent f
 	},
 
 	'11' => {
-		message => q|Empy trash.|,
-		lastUpdated => 1031514049
+		message => q|Empty trash.|,
+		lastUpdated => 1051514049
 	},
 
 	'492' => {