Changeset 4099

Timestamp:

06/11/09 08:34:58 (3 years ago)

Author:

DanielRohde

Message:

Item1652: fixed wrong web/topic context bug

File:

• trunk/HolidaylistPlugin/lib/Foswiki/Plugins/HolidaylistPlugin.pm (modified) (4 diffs)

trunk/HolidaylistPlugin/lib/Foswiki/Plugins/HolidaylistPlugin.pm

@@ -48 +48 @@
     );
 
-# This should always be $Rev: 18097 $ so that TWiki can determine the checked-in
+# This should always be $Rev: 18100 $ so that TWiki can determine the checked-in
 # status of the plugin. It is used by the build automation tools, so
 # you should leave it alone.
-$VERSION = '$Rev: 18097 $';
+$VERSION = '$Rev: 18100 $';
 
 # This is a free-form string you can use to "name" your own plugin version.
@@ -1543 +1543 @@
         }
 
-        $text =~ s/%INCLUDE{(.*?)}%/&expandIncludedEvents($1, \@processedTopics)/geo;
+        $text =~ s/%INCLUDE{(.*?)}%/&expandIncludedEvents($1, \@processedTopics, $web, $topic)/geo;
         $text =~s/\%HOLIDAYLIST({(.*?)})?%//sg;
         $text = Foswiki::Func::expandCommonVariables($text,$web,$topic);
@@ -1567 +1567 @@
 sub expandIncludedEvents
 {
-        my( $theAttributes, $theProcessedTopicsRef ) = @_;
-
-        my ($theWeb, $theTopic) = ($web, $topic);
-
-        my $webTopic = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes ) );
-        my $section = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes, 'section') );
-        my $pattern = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes, 'pattern') );
+        my( $theAttributes, $theProcessedTopicsRef, $theWeb, $theTopic ) = @_;
+
+        my $webTopic = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes ), $theTopic, $theWeb );
+        my $section = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes, 'section'), $theTopic, $theWeb );
+        my $pattern = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes, 'pattern'), $theTopic, $theWeb );
 
         
@@ -1597 +1595 @@
 
         # recursively expand includes:
-        $text =~ s/%INCLUDE{(.*?)}%/&expandIncludedEvents( $1, $theProcessedTopicsRef )/geo;
+        $text =~ s/%INCLUDE{(.*?)}%/&expandIncludedEvents( $1, $theProcessedTopicsRef, $theWeb, $theTopic )/geo;
 
         # expand common variables: