[MediaWiki-commits] [Gerrit] rcfeed: Use wfWikiID() instead of $wgDBname - change (mediawiki/core)

2014-01-10 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/106857


Change subject: rcfeed: Use wfWikiID() instead of $wgDBname
..

rcfeed: Use wfWikiID() instead of $wgDBname

Change-Id: Id1f408a4c498f23f656298e3453d2a9264e3ac7c
---
M includes/rcfeed/MachineReadableRCFeedFormatter.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/106857/1

diff --git a/includes/rcfeed/MachineReadableRCFeedFormatter.php 
b/includes/rcfeed/MachineReadableRCFeedFormatter.php
index 565d0eb..9321f52 100644
--- a/includes/rcfeed/MachineReadableRCFeedFormatter.php
+++ b/includes/rcfeed/MachineReadableRCFeedFormatter.php
@@ -38,7 +38,7 @@
 * @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 @@
 
$packet['server_url'] = $wgCanonicalServer;
$packet['server_script_path'] = $wgScriptPath ?: '/';
-   $packet['wiki'] = $wgDBname;
+   $packet['wiki'] = wfWikiID();
 
return $this-formatArray( $packet );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/106857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1f408a4c498f23f656298e3453d2a9264e3ac7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] rcfeed: Use wfWikiID() instead of $wgDBname - change (mediawiki/core)

2014-01-10 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: rcfeed: Use wfWikiID() instead of $wgDBname
..


rcfeed: Use wfWikiID() instead of $wgDBname

Change-Id: Id1f408a4c498f23f656298e3453d2a9264e3ac7c
---
M includes/rcfeed/MachineReadableRCFeedFormatter.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Parent5446: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/rcfeed/MachineReadableRCFeedFormatter.php 
b/includes/rcfeed/MachineReadableRCFeedFormatter.php
index 565d0eb..9321f52 100644
--- a/includes/rcfeed/MachineReadableRCFeedFormatter.php
+++ b/includes/rcfeed/MachineReadableRCFeedFormatter.php
@@ -38,7 +38,7 @@
 * @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 @@
 
$packet['server_url'] = $wgCanonicalServer;
$packet['server_script_path'] = $wgScriptPath ?: '/';
-   $packet['wiki'] = $wgDBname;
+   $packet['wiki'] = wfWikiID();
 
return $this-formatArray( $packet );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/106857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1f408a4c498f23f656298e3453d2a9264e3ac7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits