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 "API: Add ApiPageSet accessors for just good and missing titles"
[lhc/web/wiklou.git]
/
includes
/
Message.php
diff --git
a/includes/Message.php
b/includes/Message.php
index
4df0d80
..
59c5120
100644
(file)
--- a/
includes/Message.php
+++ b/
includes/Message.php
@@
-674,11
+674,10
@@
class Message {
$string = $this->fetchMessage();
if ( $string === false ) {
$string = $this->fetchMessage();
if ( $string === false ) {
- $key = htmlspecialchars( $this->key );
- if ( $this->format === 'plain' ) {
- return '<' . $key . '>';
+ if ( $this->format === 'plain' || $this->format === 'text' ) {
+ return '<' . $this->key . '>';
}
}
- return '<' .
$key
. '>';
+ return '<' .
htmlspecialchars( $this->key )
. '>';
}
# Replace $* with a list of parameters for &uselang=qqx.
}
# Replace $* with a list of parameters for &uselang=qqx.
@@
-735,10
+734,10
@@
class Message {
// Doh! Cause a fatal error after all?
}
// Doh! Cause a fatal error after all?
}
- if ( $this->format === 'plain' ) {
+ if ( $this->format === 'plain'
|| $this->format === 'text'
) {
return '<' . $this->key . '>';
}
return '<' . $this->key . '>';
}
- return '<' .
$this->key
. '>';
+ return '<' .
htmlspecialchars( $this->key )
. '>';
}
}
}
}