| Index: trunk/phase3/maintenance/doMaintenance.php |
| — | — | @@ -67,6 +67,7 @@ |
| 68 | 68 | # Get the MWInit class |
| 69 | 69 | if ( !defined( 'MW_COMPILED' ) ) { |
| 70 | 70 | require_once( "$IP/includes/Init.php" ); |
| | 71 | + require_once( "$IP/includes/AutoLoader.php" ); |
| 71 | 72 | } |
| 72 | 73 | |
| 73 | 74 | # Stub the profiler |
| — | — | @@ -74,7 +75,6 @@ |
| 75 | 76 | |
| 76 | 77 | // Some other requires |
| 77 | 78 | if ( !defined( 'MW_COMPILED' ) ) { |
| 78 | | - require_once( "$IP/includes/AutoLoader.php" ); |
| 79 | 79 | require_once( "$IP/includes/Defines.php" ); |
| 80 | 80 | } |
| 81 | 81 | require_once( "$IP/includes/DefaultSettings.php" ); |
| Index: trunk/phase3/includes/profiler/Profiler.php |
| — | — | @@ -95,6 +95,14 @@ |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
| | 99 | + * Set the profiler to a specific profiler instance. Mostly for dumpHTML |
| | 100 | + * @param $p Profiler object |
| | 101 | + */ |
| | 102 | + public static function setInstance( Profiler $p ) { |
| | 103 | + self::$__instance = $p; |
| | 104 | + } |
| | 105 | + |
| | 106 | + /** |
| 99 | 107 | * Called by wfProfieIn() |
| 100 | 108 | * |
| 101 | 109 | * @param $functionname String |