diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index fbece7c37..047f03a18 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -21,6 +21,9 @@ - change: overlong alternate text for Weather Data icons shortened to basename - fix: multiple problems with static export, including wrong asset context and wrong status messages - fix: WebGUI::Asset->new interacting badly with caching + - fix: changeUrlConfirm returns to previous URL rather than new URL + - fix: performance indicators interfering with CSS + - fix: admin bar causes pages to extend forever 7.0.7 - rfe: Image Management (funded by Formation Design Systems) diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index aeead9f08..3bb5cb118 100644 --- a/lib/WebGUI.pm +++ b/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); diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 1278954f9..4397279b5 100644 --- a/lib/WebGUI/Asset.pm +++ b/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; } diff --git a/www/extras/slidePanel/slidePanel.js b/www/extras/slidePanel/slidePanel.js index ed2c59b3e..986d5b7bc 100644 --- a/www/extras/slidePanel/slidePanel.js +++ b/www/extras/slidePanel/slidePanel.js @@ -92,7 +92,8 @@ function sp_draw() { var c=3; //slide panel - document.write('
'); + document.write('
'); document.write('