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 "ParserOutput::addLanguageLink needs a string"
[lhc/web/wiklou.git]
/
includes
/
ChangesList.php
diff --git
a/includes/ChangesList.php
b/includes/ChangesList.php
index
8467712
..
f8dbf3b
100644
(file)
--- a/
includes/ChangesList.php
+++ b/
includes/ChangesList.php
@@
-435,6
+435,7
@@
class ChangesList extends ContextSource {
return Linker::commentBlock( $rc->mAttribs['rc_comment'], $rc->getTitle() );
}
}
return Linker::commentBlock( $rc->mAttribs['rc_comment'], $rc->getTitle() );
}
}
+ return '';
}
/**
}
/**
@@
-514,12
+515,12
@@
class ChangesList extends ContextSource {
if ( $this->getUser()->isAllowed('rollback') && $rc->mAttribs['page_latest'] == $rc->mAttribs['rc_this_oldid'] )
{
$rev = new Revision( array(
if ( $this->getUser()->isAllowed('rollback') && $rc->mAttribs['page_latest'] == $rc->mAttribs['rc_this_oldid'] )
{
$rev = new Revision( array(
+ 'title' => $page,
'id' => $rc->mAttribs['rc_this_oldid'],
'user' => $rc->mAttribs['rc_user'],
'user_text' => $rc->mAttribs['rc_user_text'],
'deleted' => $rc->mAttribs['rc_deleted']
) );
'id' => $rc->mAttribs['rc_this_oldid'],
'user' => $rc->mAttribs['rc_user'],
'user_text' => $rc->mAttribs['rc_user_text'],
'deleted' => $rc->mAttribs['rc_deleted']
) );
- $rev->setTitle( $page );
$s .= ' '.Linker::generateRollback( $rev, $this->getContext() );
}
}
$s .= ' '.Linker::generateRollback( $rev, $this->getContext() );
}
}
@@
-862,6
+863,8
@@
class EnhancedChangesList extends ChangesList {
# Other properties
$unpatrolled = false;
$isnew = false;
# Other properties
$unpatrolled = false;
$isnew = false;
+ $allBots = true;
+ $allMinors = true;
$curId = $currentRevision = 0;
# Some catalyst variables...
$namehidden = true;
$curId = $currentRevision = 0;
# Some catalyst variables...
$namehidden = true;
@@
-895,7
+898,13
@@
class EnhancedChangesList extends ChangesList {
$currentRevision = $rcObj->mAttribs['rc_this_oldid'];
}
$currentRevision = $rcObj->mAttribs['rc_this_oldid'];
}
- $bot = $rcObj->mAttribs['rc_bot'];
+ if( !$rcObj->mAttribs['rc_bot'] ) {
+ $allBots = false;
+ }
+ if( !$rcObj->mAttribs['rc_minor'] ) {
+ $allMinors = false;
+ }
+
$userlinks[$u]++;
}
$userlinks[$u]++;
}
@@
-922,10
+931,10
@@
class EnhancedChangesList extends ChangesList {
# Main line
$r .= '<td class="mw-enhanced-rc">' . $this->recentChangesFlags( array(
# Main line
$r .= '<td class="mw-enhanced-rc">' . $this->recentChangesFlags( array(
- 'newpage' => $isnew,
- 'minor' =>
false,
- 'unpatrolled' => $unpatrolled,
- 'bot' => $
bot ,
+ 'newpage' => $isnew,
# show, when one have this flag
+ 'minor' =>
$allMinors, # show only, when all have this flag
+ 'unpatrolled' => $unpatrolled,
# show, when one have this flag
+ 'bot' => $
allBots, # show only, when all have this flag
) );
# Timestamp
) );
# Timestamp
@@
-1058,8
+1067,9
@@
class EnhancedChangesList extends ChangesList {
array(),
$params
);
array(),
$params
);
- if( $this->isDeleted(
$rcObj,Revision::DELETED_TEXT) )
+ if( $this->isDeleted(
$rcObj, Revision::DELETED_TEXT ) ) {
$link = '<span class="history-deleted">'.$link.'</span> ';
$link = '<span class="history-deleted">'.$link.'</span> ';
+ }
}
$r .= $link . '</span>';
}
$r .= $link . '</span>';