Changeset 5820

Timestamp:

12/18/09 11:10:35 (2 years ago)

Author:

CrawfordCurrie

Message:

Item2511: another optimisation; if a plugin states NO_PREFS_IN_TOPIC, then there is no real need to search for the topic, just default to $systemWeb. That means $installWeb may be wrong in the initPlugin call if the plugin was not installed in the System web; but they are never installed anywhere else (AFAIK) so the search is probably pointless

Location:

trunk/core/lib

Files:

• Foswiki.pm (modified) (1 diff)
• Foswiki/Plugin.pm (modified) (3 diffs)
• Foswiki/Plugins.pm (modified) (2 diffs)

trunk/core/lib/Foswiki.pm

@@ -2755 +2755 @@
 
                 #print STDERR ' ' x $tell,"POP $tag\n";
-                Monitor::MARK("Before $tag");
+                #Monitor::MARK("Before $tag");
                 my $e = &$tagf( $this, $tag, $args, $topicObject );
-                Monitor::MARK("After $tag");
+                #Monitor::MARK("After $tag");
 
                 if ( defined($e) ) {

trunk/core/lib/Foswiki/Plugin.pm

@@ -352 +352 @@
 
 Find the web that has the topic for this plugin by searching the
-{Plugins}{WebSearchPath}
+{Plugins}{WebSearchPath}. Returns undef if $NO_PREFS_IN_TOPIC=1
 
 =cut
@@ -359 +359 @@
     my $this = shift;
 
-    unless ( $this->{topicWeb} ) {
+    unless ( defined( $this->{topicWeb} ) || $this->{no_topic} ) {
 
         # Find the plugin topic, if required
@@ -373 +373 @@
             }
         }
-        ASSERT( $this->{topicWeb}, $this->{name} ) if DEBUG;
-    }
-    return $this->{topicWeb};
+    }
+    # If there is no web (probably because NO_PREFS_IN_TOPIC is set)
+    # then default to the system web name.
+    return $this->{topicWeb} || $Foswiki::cfg{SystemWebName};
 }
 

trunk/core/lib/Foswiki/Plugins.pm

@@ -171 +171 @@
     }
 
+    # Uncomment this to monitor plugin load times
     #Monitor::MARK('About to initPlugins');
+
     my $user;           # the user login name
     my $userDefiner;    # the plugin that is defining the user
@@ -200 +202 @@
         }
         $lookup{$pn} = $p;
+
+        # Uncomment this to monitor plugin load times
         #Monitor::MARK($pn);
     }