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 "Add missing dependency from 'mediawiki.user' to 'mediawiki.storage'"
[lhc/web/wiklou.git]
/
includes
/
FeedUtils.php
diff --git
a/includes/FeedUtils.php
b/includes/FeedUtils.php
index
d7dbd22
..
3268291
100644
(file)
--- a/
includes/FeedUtils.php
+++ b/
includes/FeedUtils.php
@@
-39,6
+39,7
@@
class FeedUtils {
global $wgRequest, $wgUser;
$purge = $wgRequest->getVal( 'action' ) === 'purge';
global $wgRequest, $wgUser;
$purge = $wgRequest->getVal( 'action' ) === 'purge';
+ // Allow users with 'purge' right to clear feed caches
if ( $purge && $wgUser->isAllowed( 'purge' ) ) {
$cache = ObjectCache::getMainWANInstance();
$cache->delete( $timekey, 1 );
if ( $purge && $wgUser->isAllowed( 'purge' ) ) {
$cache = ObjectCache::getMainWANInstance();
$cache->delete( $timekey, 1 );
@@
-128,13
+129,6
@@
class FeedUtils {
}
if ( $oldid ) {
}
if ( $oldid ) {
-
- # $diffText = $de->getDiff( wfMessage( 'revisionasof',
- # $wgLang->timeanddate( $timestamp ),
- # $wgLang->date( $timestamp ),
- # $wgLang->time( $timestamp ) )->text(),
- # wfMessage( 'currentrev' )->text() );
-
$diffText = '';
// Don't bother generating the diff if we won't be able to show it
if ( $wgFeedDiffCutoff > 0 ) {
$diffText = '';
// Don't bother generating the diff if we won't be able to show it
if ( $wgFeedDiffCutoff > 0 ) {
@@
-195,7
+189,7
@@
class FeedUtils {
if ( $html === null ) {
if ( $html === null ) {
- // Omit large new page diffs,
bug 29
110
+ // Omit large new page diffs,
T31
110
// Also use diff link for non-textual content
$diffText = self::getDiffLink( $title, $newid );
} else {
// Also use diff link for non-textual content
$diffText = self::getDiffLink( $title, $newid );
} else {