allow pre-started Profiler

diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
index 9269df5..d96a755 100755 (executable)
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -8,6 +8,8 @@
  * @todo document
  * @package MediaWiki
  */
+require_once('Profiling.php');
+
 class ProfilerSimple extends Profiler {
        function ProfilerSimple() {
                global $wgRequestTime,$wgRUstart;

diff --git a/includes/Setup.php b/includes/Setup.php
index 1fdc3f8..75f830f 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -24,8 +24,11 @@ if ( !isset( $wgVersion ) ) {
 if( !isset( $wgProfiling ) )
        $wgProfiling = false;
 
-if ( $wgProfiling and (0 == rand() % $wgProfileSampleRate ) ) {
+if ( is_object($wgProfiler) ) {
+       /* nada, everything should be done already */
+} elseif ( $wgProfiling and (0 == rand() % $wgProfileSampleRate ) ) {
        require_once( 'Profiling.php' );
+       $wgProfiling = true;
        if ($wgProfilerType == "") {
                $wgProfiler = new Profiler();
        } else {