Apply slightly modified versions of DBell's patches for:

- admin bar causing pages to extend forever
  - changing asset URL returning to old URL rather than new
  - performance indicators interfering with non-HTML data

lib/WebGUI.pm

@@ -107,7 +107,16 @@ sub contentHandler {
 			if ($output =~ /<\/title>/) {
 				$output =~ s/<\/title>/ : ${t} seconds<\/title>/i;
 			} else {
-				$session->output->print("\nPage generated in $t seconds.\n");
+				# Kludge.
+				my $mimeType = $session->http->getMimeType();
+				if ($mimeType eq 'text/css') {
+					$session->output->print("\n/* Page generated in $t seconds. */\n");
+				} elsif ($mimeType eq 'text/html') {
+					$session->output->print("\nPage generated in $t seconds.\n");
+				} else {
+					# Don't apply to content when we don't know how
+					# to modify it semi-safely.
+				}
 			}
 		} else {
 			$output = page($session);

lib/WebGUI/Asset.pm

@@ -1925,9 +1925,15 @@ sub www_changeUrlConfirm {
                         $old->purgeRevision if defined $old;
                 }
 	}
+
 	if ($self->session->form->param("proceed") eq "manageAssets") {
-		return $self->www_manageAssets;
+		$self->session->http->setRedirect($self->getUrl('func=manageAssets'));
+		return 'redirect';
+	} else {
+		$self->session->http->setRedirect($self->getUrl());
+		return 'redirect';
 	}
+
 	return undef;
 }