Changeset 13836 for branches/Release01x01/core/lib/Foswiki/Func.pm

Timestamp:

01/27/12 05:14:49 (4 months ago)

Author:

PaulHarvey

Message:

Item11431: add ASSERTs for SINGLE_SINGLETONS

Conflicts:

lib/Foswiki.pm

File:

• branches/Release01x01/core/lib/Foswiki/Func.pm (modified) (4 diffs)

branches/Release01x01/core/lib/Foswiki/Func.pm

@@ -576 +576 @@
     my ( $tag, $function, $syntax ) = @_;
     ASSERT($Foswiki::Plugins::SESSION) if DEBUG;
+    ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') ) if DEBUG;
 
     # $pluginContext is undefined if a contrib registers a tag handler.
@@ -589 +590 @@
         sub {
             my ( $session, $params, $topicObject ) = @_;
-            my $record = $Foswiki::Plugins::SESSION;
-            $Foswiki::Plugins::SESSION = $_[0];
+            local $Foswiki::Plugins::SESSION = $session;
 
             # $pluginContext is defined for all plugins
@@ -607 +607 @@
 
             # Compatibility; expand $topicObject to the topic and web
-            my $result =
-              &$function( $session, $params, $topicObject->topic,
+            return &$function( $session, $params, $topicObject->topic,
                 $topicObject->web, $topicObject );
-            $Foswiki::Plugins::SESSION = $record;
-            return $result;
         },
         $syntax
@@ -704 +701 @@
             my $record = $Foswiki::Plugins::SESSION;
             $Foswiki::Plugins::SESSION = $_[0];
+            ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') ) if DEBUG;
             my $result = &$function(@_);
             $Foswiki::Plugins::SESSION = $record;