| Index: trunk/phase3/includes/profiler/ProfilerSimpleTrace.php |
| — | — | @@ -11,7 +11,6 @@ |
| 12 | 12 | */ |
| 13 | 13 | class ProfilerSimpleTrace extends ProfilerSimple { |
| 14 | 14 | var $mMinimumTime = 0; |
| 15 | | - var $mProfileID = false; |
| 16 | 15 | var $trace = ""; |
| 17 | 16 | var $memory = 0; |
| 18 | 17 | |
| Index: trunk/phase3/includes/profiler/ProfilerSimple.php |
| — | — | @@ -11,7 +11,6 @@ |
| 12 | 12 | */ |
| 13 | 13 | class ProfilerSimple extends Profiler { |
| 14 | 14 | var $mMinimumTime = 0; |
| 15 | | - var $mProfileID = false; |
| 16 | 15 | |
| 17 | 16 | function __construct() { |
| 18 | 17 | global $wgRequestTime, $wgRUstart; |
| — | — | @@ -38,18 +37,6 @@ |
| 39 | 38 | $this->mMinimumTime = $min; |
| 40 | 39 | } |
| 41 | 40 | |
| 42 | | - function setProfileID( $id ) { |
| 43 | | - $this->mProfileID = $id; |
| 44 | | - } |
| 45 | | - |
| 46 | | - function getProfileID() { |
| 47 | | - if ( $this->mProfileID === false ) { |
| 48 | | - return wfWikiID(); |
| 49 | | - } else { |
| 50 | | - return $this->mProfileID; |
| 51 | | - } |
| 52 | | - } |
| 53 | | - |
| 54 | 41 | function profileIn($functionname) { |
| 55 | 42 | global $wgDebugFunctionEntry; |
| 56 | 43 | if ($wgDebugFunctionEntry) { |
| Index: trunk/phase3/includes/profiler/Profiler.php |
| — | — | @@ -61,6 +61,7 @@ |
| 62 | 62 | var $mStack = array (), $mWorkStack = array (), $mCollated = array (); |
| 63 | 63 | var $mCalls = array (), $mTotals = array (); |
| 64 | 64 | var $mTemplated = false; |
| | 65 | + protected $mProfileID = false; |
| 65 | 66 | private static $__instance = null; |
| 66 | 67 | |
| 67 | 68 | function __construct() { |
| — | — | @@ -102,6 +103,18 @@ |
| 103 | 104 | self::$__instance = $p; |
| 104 | 105 | } |
| 105 | 106 | |
| | 107 | + public function setProfileID( $id ) { |
| | 108 | + $this->mProfileID = $id; |
| | 109 | + } |
| | 110 | + |
| | 111 | + public function getProfileID() { |
| | 112 | + if ( $this->mProfileID === false ) { |
| | 113 | + return wfWikiID(); |
| | 114 | + } else { |
| | 115 | + return $this->mProfileID; |
| | 116 | + } |
| | 117 | + } |
| | 118 | + |
| 106 | 119 | /** |
| 107 | 120 | * Called by wfProfieIn() |
| 108 | 121 | * |