| Index: trunk/phase3/includes/profiler/ProfilerSimpleTrace.php |
| — | — | @@ -14,8 +14,9 @@ |
| 15 | 15 | var $trace = ""; |
| 16 | 16 | var $memory = 0; |
| 17 | 17 | |
| 18 | | - function __construct() { |
| | 18 | + function __construct( $params ) { |
| 19 | 19 | global $wgRequestTime, $wgRUstart; |
| | 20 | + parent::__construct( $params ); |
| 20 | 21 | if ( !empty( $wgRequestTime ) && !empty( $wgRUstart ) ) { |
| 21 | 22 | $this->mWorkStack[] = array( '-total', 0, $wgRequestTime, $this->getCpuTime( $wgRUstart ) ); |
| 22 | 23 | } |
| Index: trunk/phase3/includes/profiler/ProfilerSimple.php |
| — | — | @@ -12,8 +12,9 @@ |
| 13 | 13 | class ProfilerSimple extends Profiler { |
| 14 | 14 | var $mMinimumTime = 0; |
| 15 | 15 | |
| 16 | | - function __construct() { |
| | 16 | + function __construct( $params ) { |
| 17 | 17 | global $wgRequestTime, $wgRUstart; |
| | 18 | + parent::__construct( $params ); |
| 18 | 19 | if (!empty($wgRequestTime) && !empty($wgRUstart)) { |
| 19 | 20 | $this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart)); |
| 20 | 21 | |
| Index: trunk/phase3/includes/profiler/ProfilerSimpleText.php |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | if( isset( $profileConfig['visible'] ) && $profileConfig['visible'] ) { |
| 24 | 24 | $this->visible = true; |
| 25 | 25 | } |
| 26 | | - parent::__construct(); |
| | 26 | + parent::__construct( $profileConfig ); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | public function logData() { |
| Index: trunk/phase3/includes/profiler/Profiler.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | protected $mProfileID = false; |
| 44 | 44 | private static $__instance = null; |
| 45 | 45 | |
| 46 | | - function __construct( $params = null ) { |
| | 46 | + function __construct( $params ) { |
| 47 | 47 | // Push an entry for the pre-profile setup time onto the stack |
| 48 | 48 | global $wgRequestTime; |
| 49 | 49 | if ( !empty( $wgRequestTime ) ) { |
| — | — | @@ -69,7 +69,7 @@ |
| 70 | 70 | } elseif( $wgProfiler instanceof Profiler ) { |
| 71 | 71 | self::$__instance = $wgProfiler; // back-compat |
| 72 | 72 | } else { |
| 73 | | - self::$__instance = new ProfilerStub; |
| | 73 | + self::$__instance = new ProfilerStub( $wgProfiler ); |
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | return self::$__instance; |