Merge "resourceloader: Remove obsolete msg_resource database table"

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 0d1314f..49b9786 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1294,7 +1294,7 @@ class ApiMain extends ApiBase {
                        'dt' => date( 'c' ),
                        'client_ip' => $request->getIP(),
                        'user_agent' => $this->getUserAgent(),
-                       'wiki' => wfWikiId(),
+                       'wiki' => wfWikiID(),
                        'time_backend_ms' => round( $time * 1000 ),
                        'params' => array(),
                );

diff --git a/includes/user/LocalIdLookup.php b/includes/user/LocalIdLookup.php
index 04c5b90..58892ea 100644 (file)
--- a/includes/user/LocalIdLookup.php
+++ b/includes/user/LocalIdLookup.php
@@ -40,7 +40,7 @@ class LocalIdLookup extends CentralIdLookup {
                }
 
                // Easy case, we're checking locally
-               if ( $wikiId === null || $wikiId === wfWikiId() ) {
+               if ( $wikiId === null || $wikiId === wfWikiID() ) {
                        return true;
                }