From: Kunal Mehta <legoktm@gmail.com>
Date: Sat, 11 Jan 2014 01:52:25 +0000 (-0800)
Subject: rcfeed: Use wfWikiID() instead of $wgDBname
X-Git-Tag: 1.31.0-rc.0~17287^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f1d28a569d0f1a844c4b3c3731817415dd2a2e34;p=lhc%2Fweb%2Fwiklou.git

rcfeed: Use wfWikiID() instead of $wgDBname

Change-Id: Id1f408a4c498f23f656298e3453d2a9264e3ac7c
---

diff --git a/includes/rcfeed/MachineReadableRCFeedFormatter.php b/includes/rcfeed/MachineReadableRCFeedFormatter.php
index 565d0eb6d4..9321f52bc2 100644
--- a/includes/rcfeed/MachineReadableRCFeedFormatter.php
+++ b/includes/rcfeed/MachineReadableRCFeedFormatter.php
@@ -38,7 +38,7 @@ abstract class MachineReadableRCFeedFormatter implements RCFeedFormatter {
 	 * @see RCFeedFormatter::getLine
 	 */
 	public function getLine( array $feed, RecentChange $rc, $actionComment ) {
-		global $wgCanonicalServer, $wgScriptPath, $wgDBname;
+		global $wgCanonicalServer, $wgScriptPath;
 		$attrib = $rc->getAttributes();
 
 		$packet = array(
@@ -121,7 +121,7 @@ abstract class MachineReadableRCFeedFormatter implements RCFeedFormatter {
 
 		$packet['server_url'] = $wgCanonicalServer;
 		$packet['server_script_path'] = $wgScriptPath ?: '/';
-		$packet['wiki'] = $wgDBname;
+		$packet['wiki'] = wfWikiID();
 
 		return $this->formatArray( $packet );
 	}