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
Add test for WikiPage post-edit stats update
[lhc/web/wiklou.git]
/
includes
/
logging
/
LogFormatter.php
diff --git
a/includes/logging/LogFormatter.php
b/includes/logging/LogFormatter.php
index
2a47943
..
b28bb7d
100644
(file)
--- a/
includes/logging/LogFormatter.php
+++ b/
includes/logging/LogFormatter.php
@@
-261,19
+261,15
@@
class LogFormatter {
$text = wfMessage( 'undeletedarticle' )
->rawParams( $target )->inContentLanguage()->escaped();
break;
$text = wfMessage( 'undeletedarticle' )
->rawParams( $target )->inContentLanguage()->escaped();
break;
- // @codingStandardsIgnoreStart Long line
//case 'revision': // Revision deletion
//case 'event': // Log deletion
// see https://github.com/wikimedia/mediawiki/commit/a9c243b7b5289dad204278dbe7ed571fd914e395
//default:
//case 'revision': // Revision deletion
//case 'event': // Log deletion
// see https://github.com/wikimedia/mediawiki/commit/a9c243b7b5289dad204278dbe7ed571fd914e395
//default:
- // @codingStandardsIgnoreEnd
}
break;
case 'patrol':
}
break;
case 'patrol':
- // @codingStandardsIgnoreStart Long line
// https://github.com/wikimedia/mediawiki/commit/1a05f8faf78675dc85984f27f355b8825b43efff
// https://github.com/wikimedia/mediawiki/commit/1a05f8faf78675dc85984f27f355b8825b43efff
- // @codingStandardsIgnoreEnd
// Create a diff link to the patrolled revision
if ( $entry->getSubtype() === 'patrol' ) {
$diffLink = htmlspecialchars(
// Create a diff link to the patrolled revision
if ( $entry->getSubtype() === 'patrol' ) {
$diffLink = htmlspecialchars(
@@
-644,12
+640,13
@@
class LogFormatter {
* @return string
*/
protected function makePageLink( Title $title = null, $parameters = [], $html = null ) {
* @return string
*/
protected function makePageLink( Title $title = null, $parameters = [], $html = null ) {
+ if ( !$title instanceof Title ) {
+ throw new MWException( 'Expected title, got null' );
+ }
if ( !$this->plaintext ) {
if ( !$this->plaintext ) {
- $link = Linker::link( $title, $html, [], $parameters );
+ $html = $html !== null ? new HtmlArmor( $html ) : $html;
+ $link = $this->getLinkRenderer()->makeLink( $title, $html, [], $parameters );
} else {
} else {
- if ( !$title instanceof Title ) {
- throw new MWException( "Expected title, got null" );
- }
$link = '[[' . $title->getPrefixedText() . ']]';
}
$link = '[[' . $title->getPrefixedText() . ']]';
}
@@
-866,10
+863,12
@@
class LogFormatter {
case 'title':
case 'title-link':
$title = Title::newFromText( $value );
case 'title':
case 'title-link':
$title = Title::newFromText( $value );
- if ( $title ) {
- $value = [];
-
ApiQueryBase::addTitleInfo( $value, $title, "{$name}_"
);
+ if (
!
$title ) {
+ // Huh? Do something halfway sane.
+
$title = SpecialPage::getTitleFor( 'Badtitle', $value
);
}
}
+ $value = [];
+ ApiQueryBase::addTitleInfo( $value, $title, "{$name}_" );
return $value;
case 'user':
return $value;
case 'user':