From 261a8d7caa72af5a15e183a59c7e8aa96ab68d2b Mon Sep 17 00:00:00 2001
From: PaulHarvey <PaulHarvey@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Tue, 24 Nov 2009 09:58:21 +0000
Subject: [PATCH] Item2403: Improve SubscribePlugin support

git-svn-id: http://svn.foswiki.org/trunk/NatSkinPlugin@5604 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
---
 data/System/NatSkinPlugin.txt        | 1 +
 lib/Foswiki/Plugins/NatSkinPlugin.pm | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/System/NatSkinPlugin.txt b/data/System/NatSkinPlugin.txt
index 0f1499b..700e6db 100644
--- 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
index d0a624b..a109ed2 100755
--- 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 {