diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 7e92b236f..84a1d3e4e 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -2,7 +2,6 @@ - Added server side spellchecker (Martin Kamerbeek / Procolix) - Added configurable sales tax. (Tiffany Patterson / Elite Marketing) - change: made Text::Aspell optional, nullifying spellchecker if not present - - Fixed a bug where logging in/out would cause a blank page display. - change: made all LWP user agents use env_proxy - Help: If a Help Chapter only has 1 page, then in the TOC view it links right to the page instead of the Chapter. @@ -29,6 +28,7 @@ 7.1.2 + - Fixed a bug where logging in/out would cause a blank page display. - Fixed a bug that caused workflows to fail if collaboration systems and posts for that CS were in the same version tag at commit time. - fix: minor assetsToHide implementation bug in dashboard diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 9e618716e..ef3097e3e 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -494,6 +494,7 @@ sub getTemplateVars { }); } } + delete $var{'attachment_loop'} unless (scalar(@{$var{'attachment_loop'}})); return \%var; } @@ -635,6 +636,7 @@ sub notifySubscribers { my $thread = $self->getThread; my $cs = $thread->getParent; $cs->appendTemplateLabels($var); + $var->{relativeUrl} = $var->{url}; my $siteurl = $self->session->url->getSiteURL(); $var->{url} = $siteurl.$self->getUrl; $var->{'notify.subscription.message'} = $i18n->get(875,"Asset_Post"); diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 2e65ce117..74bffb109 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -871,12 +871,23 @@ sub www_saveOverride { #------------------------------------------------------------------- sub www_view { - # Hrrrm. Why doesn't the default www_view work here? - my $self = shift; - my $check = $self->checkView; - return $check if defined $check; - $self->prepareView; - return $self->view; + my $self = shift; + my $check = $self->checkView; + return $check if defined $check; + my $shortcut = $self->getShortcut; + $self->prepareView; + if ($shortcut->get("className") =~ m/Asset::Wobject/) { + $self->session->http->setLastModified($self->getContentLastModified); + $self->session->http->sendHeader; + $shortcut->prepareView; + my $style = $shortcut->processStyle("~~~"); + my ($head, $foot) = split("~~~",$style); + $self->session->output->print($head, 1); + $self->session->output->print($self->view); + $self->session->output->print($foot, 1); + return "chunked"; + } + return $shortcut->www_view; } 1; diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 59a08a014..2a4f76be7 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -252,7 +252,7 @@ sub createAccountSave { priority=>1 }); } - return ""; + return undef; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index bed45a20c..980a9e032 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -241,7 +241,7 @@ sub createAccountSave { $self->logout; return $self->displayLogin($i18n->get('check email for validation','AuthWebGUI')); } - return ""; + return undef; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Help/Asset_Post.pm b/lib/WebGUI/Help/Asset_Post.pm index 7abde8e7c..c0d14119d 100644 --- a/lib/WebGUI/Help/Asset_Post.pm +++ b/lib/WebGUI/Help/Asset_Post.pm @@ -337,7 +337,12 @@ our $HELP = { 'description' => 'notify url' }, { - 'name' => 'notification.subscription.message' + 'name' => 'relativeUrl', + 'description' => 'relativeUrl' + }, + { + 'name' => 'notification.subscription.message', + 'description' => '875' } ], related => [ diff --git a/lib/WebGUI/i18n/English/Asset_Post.pm b/lib/WebGUI/i18n/English/Asset_Post.pm index a2fda2ae5..012d7e634 100644 --- a/lib/WebGUI/i18n/English/Asset_Post.pm +++ b/lib/WebGUI/i18n/English/Asset_Post.pm @@ -6,6 +6,11 @@ our $I18N = { lastUpdated => 1111253044, }, + 'relativeUrl' => { + message => q|Provides the URL of the post relative to the server (/path/to/post) rather than fully qualified (http://host/path/to/post), which is the default.|, + lastUpdated => 1149829706, + }, + 'form.header' => { message => q|Code required to start the form for the Post.|, lastUpdated => 1149829706,