Revert to previous version using $wgDBname instead of wfWikiID(); functions

are called at times that wfWikiID() is not defined, causing fatal errors
when profiling is enabled

diff --git a/includes/ProfilerStub.php b/includes/ProfilerStub.php
index b4f8caf..4cf0aa4 100644 (file)
--- a/includes/ProfilerStub.php
+++ b/includes/ProfilerStub.php
@@ -4,20 +4,20 @@
 
 $haveProctitle=function_exists("setproctitle");
 function wfProfileIn( $fn = '' ) {
-       global $hackwhere, $haveProctitle;
+       global $hackwhere, $wgDBname, $haveProctitle;
        if ($haveProctitle) {
                $hackwhere[] = $fn;
-               setproctitle($fn . ' ['.wfWikiID().']');
+               setproctitle($fn . " [$wgDBname]");
        }
 }
 function wfProfileOut( $fn = '' ) {
-       global $hackwhere, $haveProctitle;
+       global $hackwhere, $wgDBname, $haveProctitle;
        if (!$haveProctitle)
                return;
        if (count($hackwhere))
                array_pop($hackwhere);
        if (count($hackwhere))
-               setproctitle($hackwhere[count($hackwhere)-1] . ' ['.wfWikiID().']');
+               setproctitle($hackwhere[count($hackwhere)-1] . " [$wgDBname]");
 }
 function wfGetProfilingOutput( $s, $e ) {}
 function wfProfileClose() {}