Item2403: Improve SubscribePlugin support

git-svn-id: http://svn.foswiki.org/trunk/NatSkinPlugin@5604 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 24, 2009 · 261a8d7 · 261a8d7
1 parent 534e332
commit 261a8d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/data/System/NatSkinPlugin.txt b/data/System/NatSkinPlugin.txt
@@ -229,6 +229,7 @@ See NatSkin#Installation_Instructions
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  24 Nov 2009: | improve !SubscribePlugin support |
 |  17 Nov 2009: | added support for !SolrPlugin; fixed email obfuscator; \
                   switching sidebar-context off if sidebar tempalte is empty (works only for =view=) |
 |  14 Sep 2009: | removed GETSKINSTYLE in favour of using ADDTOHEAD; \

diff --git a/lib/Foswiki/Plugins/NatSkinPlugin.pm b/lib/Foswiki/Plugins/NatSkinPlugin.pm
@@ -1166,7 +1166,8 @@ sub renderUserActions {
   }
 
   # subscribe
-  if ($text =~ /\$subscribe\b/) {
+  if (($text =~ /\$subscribe\b/ ) && 
+    (Foswiki::Func::getContext()->{SubscribePluginEnabled})) {
     if ($isRestrictedAction{'subscribe'}) {
       $subscribeString = Foswiki::Func::expandTemplate('SUBSCRIBE_ACTION_RESTRICTED');
     } else {