From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 7 May 2009 18:30:26 +0000 (+0000)
Subject: Removed StartProfiler.php from SVN control and added StartProfiler.sample file. The... 
X-Git-Tag: 1.31.0-rc.0~41852
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=248c17383dec00ce2910f42751c1b7b81564da9a;p=lhc%2Fweb%2Fwiklou.git

Removed StartProfiler.php from SVN control and added StartProfiler.sample file. The sample file can be moved to the former name to set profiling. MW will fall back to ProfilerStub.php as usual if there is no StartProfiler.php.
---

diff --git a/StartProfiler.php b/StartProfiler.php
deleted file mode 100644
index 3fcf69e6e5..0000000000
--- a/StartProfiler.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-require_once( dirname(__FILE__).'/includes/ProfilerStub.php' );
-
-/**
- * To use a profiler, delete the line above and add something like this:
- *
- *   require_once(  dirname(__FILE__).'/includes/Profiler.php' );
- *   $wgProfiler = new Profiler;
- *
- * Or for a sampling profiler:
- *   if ( !mt_rand( 0, 100 ) ) {
- *       require_once(  dirname(__FILE__).'/includes/Profiler.php' );
- *       $wgProfiler = new Profiler;
- *   } else {
- *       require_once(  dirname(__FILE__).'/includes/ProfilerStub.php' );
- *   }
- * 
- * Configuration of the profiler output can be done in LocalSettings.php
- */
-
-
diff --git a/StartProfiler.sample b/StartProfiler.sample
new file mode 100644
index 0000000000..f91aeb9281
--- /dev/null
+++ b/StartProfiler.sample
@@ -0,0 +1,23 @@
+<?php
+
+require_once( dirname(__FILE__).'/includes/ProfilerStub.php' );
+
+/**
+ * To use a profiler, copy this file to StartProfiler.php,
+ * delete the PHP line above, and add something like this:
+ *
+ *   require_once(  dirname(__FILE__).'/includes/Profiler.php' );
+ *   $wgProfiler = new Profiler;
+ *
+ * Or for a sampling profiler:
+ *   if ( !mt_rand( 0, 100 ) ) {
+ *       require_once(  dirname(__FILE__).'/includes/Profiler.php' );
+ *       $wgProfiler = new Profiler;
+ *   } else {
+ *       require_once(  dirname(__FILE__).'/includes/ProfilerStub.php' );
+ *   }
+ * 
+ * Configuration of the profiler output can be done in LocalSettings.php
+ */
+
+
diff --git a/includes/WebStart.php b/includes/WebStart.php
index ffef7be5b1..d62b4a628c 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -65,7 +65,11 @@ if ( $IP === false ) {
 
 
 # Start profiler
-require_once( "$IP/StartProfiler.php" );
+if( file_exists("$IP/StartProfiler.php") ) {
+	require_once( "$IP/StartProfiler.php" );
+} else {
+	require_once( "$IP/includes/ProfilerStub.php" );
+}
 wfProfileIn( 'WebStart.php-conf' );
 
 # Load up some global defines.