dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Allow floating point values for $wgJobBackoffThrottling"
[lhc/web/wiklou.git]
/
includes
/
rcfeed
/
MachineReadableRCFeedFormatter.php
diff --git
a/includes/rcfeed/MachineReadableRCFeedFormatter.php
b/includes/rcfeed/MachineReadableRCFeedFormatter.php
index
9321f52
..
3f17bcd
100644
(file)
--- 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 ) {
* @see RCFeedFormatter::getLine
*/
public function getLine( array $feed, RecentChange $rc, $actionComment ) {
- global $wgCanonicalServer, $wgScriptPath;
+ global $wgCanonicalServer, $wgS
erverName, $wgS
criptPath;
$attrib = $rc->getAttributes();
$packet = array(
$attrib = $rc->getAttributes();
$packet = array(
@@
-63,9
+63,9
@@
abstract class MachineReadableRCFeedFormatter implements RCFeedFormatter {
if ( $type == RC_EDIT || $type == RC_NEW ) {
global $wgUseRCPatrol, $wgUseNPPatrol;
if ( $type == RC_EDIT || $type == RC_NEW ) {
global $wgUseRCPatrol, $wgUseNPPatrol;
- $packet['minor'] = $attrib['rc_minor'];
+ $packet['minor'] =
(bool)
$attrib['rc_minor'];
if ( $wgUseRCPatrol || ( $type == RC_NEW && $wgUseNPPatrol ) ) {
if ( $wgUseRCPatrol || ( $type == RC_NEW && $wgUseNPPatrol ) ) {
- $packet['patrolled'] = $attrib['rc_patrolled'];
+ $packet['patrolled'] =
(bool)
$attrib['rc_patrolled'];
}
}
}
}
@@
-120,6
+120,8
@@
abstract class MachineReadableRCFeedFormatter implements RCFeedFormatter {
}
$packet['server_url'] = $wgCanonicalServer;
}
$packet['server_url'] = $wgCanonicalServer;
+ $packet['server_name'] = $wgServerName;
+
$packet['server_script_path'] = $wgScriptPath ?: '/';
$packet['wiki'] = wfWikiID();
$packet['server_script_path'] = $wgScriptPath ?: '/';
$packet['wiki'] = wfWikiID();