Merge branch 'master' into WebGUI8

lib/WebGUI/Role/Asset/RssFeed.pm

@@ -459,7 +459,7 @@ sub getFeed {
     $feed->description( $self->feedDescription || $self->synopsis );
     $feed->pubDate( $self->getContentLastModified );
     $feed->copyright( $self->feedCopyright );
-    $feed->link( $self->getUrl );
+    $feed->link( $self->session->url->getSiteURL . $self->getUrl );
     # $feed->language( $lang );
     if ($self->feedImage) {
         my $storage = WebGUI::Storage->get($self->session, $self->feedImage);

lib/WebGUI/Role/Asset/Subscribable.pm

@@ -38,11 +38,6 @@ sub _subscriptionTemplateId_namespace {
     my $self = shift;
     return $self->getSubscriptionTemplateNamespace($self->session);
 }
-property skipNotification => (
-            autoGenerate    => 0,
-            noFormPost      => 1,
-            fieldType       => 'yesNo',
-         );
 
 use WebGUI::Mail::Send;
 
@@ -439,27 +434,6 @@ override purge => sub {
 
 #----------------------------------------------------------------------------
 
-=head2 setSkipNotification ( )
-
-Set a flag so that this asset does not send out notifications for this 
-revision.
-
-=cut
-
-override setSkipNotification => sub {
-    my $self    = shift;
-    my $value   = shift;
-    $value      = defined $value ? $value : 1;
-
-    $self->update( {
-        skipNotification        => $value,
-    } );
-
-    return;
-};
-
-#----------------------------------------------------------------------------
-
 =head2 shouldSkipNotification ( )
 
 Returns true if the asset should skip notifications.