Changeset 3374

Timestamp:

04/05/09 15:26:17 (4 years ago)

Author:

CrawfordCurrie

Message:

Item1420: there was a core problem, that it wasn't defaulting the topic name when expanding macros when only the web was known. Not actually wrong, but enough to break some plugins.

File:

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

trunk/core/lib/Foswiki.pm

@@ -2430 +2430 @@
     my $memWeb   = $this->{prefs}->getPreference('WEB');
 
+    # Historically this couldn't be called on web objects.
+    my $webContext = $topicObject->web || $this->{webName};
+    my $topicContext = $topicObject->topic || $this->{topicName};
+
     $this->{prefs}->setInternalPreferences(
-        TOPIC => $topicObject->topic,
-        WEB   => $topicObject->web
+        TOPIC => $topicContext,
+        WEB   => $webContext
     );
 
@@ -2795 +2799 @@
     $text = $this->renderer->takeOutBlocks( $text, 'verbatim', $verbatim );
 
+    # Require defaults for plugin handlers :-(
+    my $webContext = $topicObject->web || $this->{webName};
+    my $topicContext = $topicObject->topic || $this->{topicName};
+
     my $memW = $this->{prefs}->getPreference('INCLUDINGWEB');
     my $memT = $this->{prefs}->getPreference('INCLUDINGTOPIC');
     $this->{prefs}->setInternalPreferences(
-        INCLUDINGWEB   => $topicObject->web,
-        INCLUDINGTOPIC => $topicObject->topic
+        INCLUDINGWEB   => $webContext,
+        INCLUDINGTOPIC => $topicContext
     );
 
@@ -2807 +2815 @@
 
     # Plugin Hook
-    $this->{plugins}->dispatch( 'commonTagsHandler', $text, $topicObject->topic,
-        $topicObject->web, 0, $topicObject );
+    $this->{plugins}->dispatch(
+        'commonTagsHandler', $text,
+        $topicContext,
+        $webContext,
+        0, $topicObject );
 
     # process tags again because plugin hook may have added more in
@@ -2833 +2844 @@
     # Foswiki Plugin Hook (for cache Plugins only)
     $this->{plugins}
-      ->dispatch( 'afterCommonTagsHandler', $text, $topicObject->topic,
-        $topicObject->web, $topicObject );
+      ->dispatch( 'afterCommonTagsHandler', $text, $topicContext,
+        $webContext, $topicObject );
 
     return $text;