diff --git a/docs/gotcha.txt b/docs/gotcha.txt index 73ed0b0fc..63545c51c 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -57,6 +57,13 @@ save you many hours of grief. Test::Deep Test::MockObject + * The content in the import node has had inappropriate privileges + since it was created. We're resetting the privileges to be + viewable by everyone and editable by the turn admin on + group. If this is not what you want for your site, or for + segments of the content in your import node, you'll need + to change it after the upgrade. + 6.8.4 -------------------------------------------------------------------- diff --git a/docs/upgrades/upgrade_6.8.7-6.99.0.pl b/docs/upgrades/upgrade_6.8.7-6.99.0.pl index c9f440478..d71a75a31 100644 --- a/docs/upgrades/upgrade_6.8.7-6.99.0.pl +++ b/docs/upgrades/upgrade_6.8.7-6.99.0.pl @@ -407,6 +407,10 @@ sub updateDatabaseLinksAndSQLReport { sub updateTemplates { print "\tUpdating base templates for XHTML compliance, and a cleaner look.\n" unless ($quiet); $session->db->write("alter table template add column headBlock text"); + my $template = WebGUI::Asset->new($session, "PBtmpl0000000000000003", "WebGUI::Asset::Template"); + if (defined $template) { + $template->trash; + } opendir(DIR,"templates-6.99.0"); my @files = readdir(DIR); closedir(DIR); diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index 9d980d1a9..995869c17 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -114,13 +114,6 @@ sub duplicate { } -#------------------------------------------------------------------- -sub getBox { - my $self = shift; - my $var = {}; - return $self->processTemplate($var,"PBtmpl0000000000000003"); -} - #------------------------------------------------------------------- =head2 getEditForm () diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm index 252935f12..64fbbd6be 100644 --- a/lib/WebGUI/Asset/Wobject/Article.pm +++ b/lib/WebGUI/Asset/Wobject/Article.pm @@ -154,7 +154,6 @@ sub view { my $children = $self->getLineage(["children"],{returnObjects=>1,includeOnlyClasses=>["WebGUI::Asset::File","WebGUI::Asset::File::Image"]}); foreach my $child (@{$children}) { if (ref $child eq "WebGUI::Asset::File") { - $var{"attachment.box"} = $child->getBox; $var{"attachment.icon"} = $child->getFileIconUrl; $var{"attachment.url"} = $child->getFileUrl; $var{"attachment.name"} = $child->get("filename"); diff --git a/lib/WebGUI/i18n/English/Asset_Article.pm b/lib/WebGUI/i18n/English/Asset_Article.pm index 30939d63b..46edd598b 100644 --- a/lib/WebGUI/i18n/English/Asset_Article.pm +++ b/lib/WebGUI/i18n/English/Asset_Article.pm @@ -136,11 +136,6 @@ The first three sentences in the description. A sentence is determined by counti The first four sentences in the description. A sentence is determined by counting the periods found in the text.
-
-attachment.box
-Outputs a standard WebGUI attachment box including icon, filename, and attachment indicator.
-