diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 447010e2f..7a5bbe75b 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,6 +1,10 @@ 7.5.1 - fix: Friends language error (perlDreamer Consulting, LLC.) http://www.plainblack.com/bugs/tracker/friends-language-error + - fix: newByDynamicClass would die if given bad parameters, must return undef + - fix: AssetPackage.pm would give an error on importing a package through + the web interface, but the package would be imported successfully. + - fix: 7.5.0 upgrade template for time tracker was corrupt. 7.5.0 - rfe: Search Asset returns URLs diff --git a/docs/gotcha.txt b/docs/gotcha.txt index bb7df50b8..3d5905ff6 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -7,6 +7,13 @@ upgrading from one version to the next, or even between multiple versions. Be sure to heed the warnings contained herein as they will save you many hours of grief. +7.5.1 +-------------------------------------------------------------------- + * There was a corrupt template in a package for the 7.5.0 upgrade. + If you already upgraded to 7.5.0, please import the package + located at: + WebGUI/docs/upgrades/packages-7.5.0/root_import_timetracking_user.wgpkg + 7.5.0 -------------------------------------------------------------------- * Event related links are now displayed using a template loop diff --git a/docs/upgrades/packages-7.5.0/default-tt-template-user.wgpkg b/docs/upgrades/packages-7.5.0/default-tt-template-user.wgpkg deleted file mode 100644 index 4b0e90ff0..000000000 Binary files a/docs/upgrades/packages-7.5.0/default-tt-template-user.wgpkg and /dev/null differ diff --git a/docs/upgrades/packages-7.5.0/root_import_timetracking_user.wgpkg b/docs/upgrades/packages-7.5.0/root_import_timetracking_user.wgpkg new file mode 100644 index 000000000..e03a969a4 Binary files /dev/null and b/docs/upgrades/packages-7.5.0/root_import_timetracking_user.wgpkg differ diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm index aa954df7a..4cb6b13c0 100644 --- a/lib/WebGUI/AssetPackage.pm +++ b/lib/WebGUI/AssetPackage.pm @@ -313,7 +313,7 @@ sub www_importPackage { if ($storage->getFileExtension($storage->getFiles->[0]) eq "wgpkg") { $error = $self->importPackage($storage); } - if ($error) { + if (!blessed $error) { my $i18n = WebGUI::International->new($self->session, "Asset"); return $self->session->style->userStyle($i18n->get("package corrupt")); }