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 "RedirectSpecialArticle: Fix PHP notice about undefined index"
[lhc/web/wiklou.git]
/
includes
/
changes
/
ChangesFeed.php
diff --git
a/includes/changes/ChangesFeed.php
b/includes/changes/ChangesFeed.php
index
4d00fbc
..
79092ee
100644
(file)
--- a/
includes/changes/ChangesFeed.php
+++ b/
includes/changes/ChangesFeed.php
@@
-20,6
+20,9
@@
* @file
*/
* @file
*/
+use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
+
/**
* Feed to Special:RecentChanges and Special:RecentChangesLinked.
*
/**
* Feed to Special:RecentChanges and Special:RecentChangesLinked.
*
@@
-88,9
+91,10
@@
class ChangesFeed {
}
}
}
}
+ $nsInfo = MediaWikiServices::getInstance()->getNamespaceInfo();
foreach ( $sorted as $obj ) {
$title = Title::makeTitle( $obj->rc_namespace, $obj->rc_title );
foreach ( $sorted as $obj ) {
$title = Title::makeTitle( $obj->rc_namespace, $obj->rc_title );
- $talkpage =
MWNamespace::hasTalkNamespace( $obj->rc_namespace
)
+ $talkpage =
$nsInfo->hasTalkNamespace( $obj->rc_namespace ) && $title->isValid(
)
? $title->getTalkPage()->getFullURL()
: '';
? $title->getTalkPage()->getFullURL()
: '';
@@
-114,7
+118,7
@@
class ChangesFeed {
FeedUtils::formatDiff( $obj ),
$url,
$obj->rc_timestamp,
FeedUtils::formatDiff( $obj ),
$url,
$obj->rc_timestamp,
- ( $obj->rc_deleted & Revision::DELETED_USER )
+ ( $obj->rc_deleted & Revision
Record
::DELETED_USER )
? wfMessage( 'rev-deleted-user' )->escaped() : $obj->rc_user_text,
$talkpage
);
? wfMessage( 'rev-deleted-user' )->escaped() : $obj->rc_user_text,
$talkpage
);