Merge "Revision: Assert that $mRecord is never null in Revision"

[lhc/web/wiklou.git] / includes / profiler / Profiler.php

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index d02011f..5c38159 100644 (file)
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -115,7 +115,7 @@ abstract class Profiler {
         */
        public function getProfileID() {
                if ( $this->profileID === false ) {
-                       return wfWikiID();
+                       return WikiMap::getCurrentWikiDomain()->getId();
                } else {
                        return $this->profileID;
                }
@@ -165,7 +165,7 @@ abstract class Profiler {
        abstract public function scopedProfileIn( $section );
 
        /**
-        * @param SectionProfileCallback &$section
+        * @param SectionProfileCallback|null &$section
         */
        public function scopedProfileOut( SectionProfileCallback &$section = null ) {
                $section = null;