Item11963: fixed unintended redirect after save when accessing a view…

… restricted data form git-svn-id: http://svn.foswiki.org/trunk@15058 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
andrewrjones · Jun 21, 2012 · 760aab4 · 760aab4
1 parent 61b7994
commit 760aab4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/ICalPlugin/data/System/ICalPlugin.txt b/ICalPlugin/data/System/ICalPlugin.txt
@@ -169,6 +169,7 @@ Finally, the standard foswiki escape variables are expanded:
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  21 Jun 2012 | fixed unintended redirect after save when accessing a view restricted data form |
 |  08 May 2012 | fixed processing of weekly recurrences without a <nop>StartDate |
 |  07 May 2012 | made dependency on Foswiki:Extensions/MetaDataPlugin optional |
 |  27 Apr 2012 | expand macros in ICALPLUGIN_CALENDAR variable; \

diff --git a/ICalPlugin/lib/Foswiki/Plugins/ICalPlugin.pm b/ICalPlugin/lib/Foswiki/Plugins/ICalPlugin.pm
@@ -21,7 +21,7 @@ use warnings;
 use Foswiki::Func ();
 
 our $VERSION = '$Rev$';
-our $RELEASE = '1.12';
+our $RELEASE = '1.13';
 our $SHORTDESCRIPTION = 'Access ical data in wikiapps';
 our $NO_PREFS_IN_TOPIC = 1;
 our $core;
@@ -32,6 +32,8 @@ our $baseWeb;
 sub initPlugin {
   ($baseTopic, $baseWeb) = @_;
 
+  $core = undef;
+
   Foswiki::Func::registerTagHandler(
     'FORMATICAL',
     sub {
@@ -60,10 +62,6 @@ sub initPlugin {
   return 1;
 }
 
-###############################################################################
-sub finishPlugin {
-  $core = undef;
-}
 
 ###############################################################################
 sub afterSaveHandler {

diff --git a/ICalPlugin/lib/Foswiki/Plugins/ICalPlugin/Core.pm b/ICalPlugin/lib/Foswiki/Plugins/ICalPlugin/Core.pm
@@ -689,7 +689,14 @@ sub getEventsFromMetaData {
     next unless Foswiki::Func::topicExists($formWeb, $formTopic);
 
     # now check the TopicType for "EventTopic"
-    my $form = new Foswiki::Form($Foswiki::Plugins::SESSION, $formWeb, $formTopic);
+    my $form;
+    try {
+      $form = new Foswiki::Form($Foswiki::Plugins::SESSION, $formWeb, $formTopic);
+    } catch Foswiki::AccessControlException with {
+      # catch but simply bail out
+      writeDebug("access exception reading $formWeb.$formTopic");
+    };
+    next unless $form;
 
     my $topicTypeField = $form->getField('TopicType');
     next unless $topicTypeField;