merging 7.1.3 changes

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");

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;

lib/WebGUI/Auth.pm

@@ -252,7 +252,7 @@ sub createAccountSave {
 			priority=>1
 			});
 	}
-	return "";
+	return undef;
 }
 
 #-------------------------------------------------------------------

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;
 }
 
 #-------------------------------------------------------------------

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 => [

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,