Item14440: Restore ability to search for calendar events.

Item10135 broke that feature by removing the expandCommonVariables call.
foswiki · Jul 19, 2017 · 8b05d62 · 8b05d62
1 parent cb1645a
commit 8b05d62
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/data/System/CalendarPlugin.txt b/data/System/CalendarPlugin.txt
@@ -406,7 +406,8 @@ font-weight:bold;
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  2.100 (1 Sep 2015):  | Foswiki:Tasks.Item2038: Preserve header colors across multiple months.<br/>\
+|  2.020 (18 Jul 2017): | Foswiki:Tasks.Item14440: Restore expansion of macros for Calendar event topics. |
+|  2.010 (1 Sep 2015):  | Foswiki:Tasks.Item2038: Preserve header colors across multiple months.<br/>\
                           Foswiki:Tasks.Item10135: Don't omit events outside of STARTINCLUDE/STOPINCLUDE blocks<br/>\
                           Foswiki:Tasks.Item11202: Modernize CalendarPlugin (phase 1)<br/>\
                           Update copyright, Eliminate Subversion macros, Remove high characters from plugin topic. Foswiki:Main.GeorgeClark |

diff --git a/lib/Foswiki/Plugins/CalendarPlugin.pm b/lib/Foswiki/Plugins/CalendarPlugin.pm
@@ -6,8 +6,8 @@ use strict;
 use warnings;
 
 # See plugin topic for complete release history
-our $VERSION           = '2.010';
-our $RELEASE           = '2.010';
+our $VERSION           = '2.020';
+our $RELEASE           = '18 Jul 2017';
 our $SHORTDESCRIPTION  = 'Show a monthly calendar with highlighted events';
 our $NO_PREFS_IN_TOPIC = 1;
 
@@ -30,4 +30,4 @@ Copyright (C) 2001 Andrea Sterbini, a.sterbini@flashnet.it
 Christian Schultze: debugging, relative month/year, highlight today
 Akim Demaille <akim@freefriends.org>: handle date intervals.
 Copyright (C) 2002-2006 Peter Thoeny, peter@thoeny.org
-Copyright (C) 2008-2015 Foswiki Contributors
+Copyright (C) 2008-2017 Foswiki Contributors
diff --git a/lib/Foswiki/Plugins/CalendarPlugin/Core.pm b/lib/Foswiki/Plugins/CalendarPlugin/Core.pm
@@ -485,7 +485,7 @@ MESSAGE
                 "VIEW", $session->{user}, undef, $evTopic, $evWeb
             ) ) {
             my ($meta, $evText) = Foswiki::Func::readTopic( $evWeb, $evTopic );
-            $text .= $evText;
+            $text .= Foswiki::Func::expandCommonVariables($evText);
         }
     }