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 "Replace unecessary rollbackMasterChangesAndLog() call in doPostOutputShutdown()"
[lhc/web/wiklou.git]
/
includes
/
skins
/
BaseTemplate.php
diff --git
a/includes/skins/BaseTemplate.php
b/includes/skins/BaseTemplate.php
index
6d108e8
..
09e439b
100644
(file)
--- a/
includes/skins/BaseTemplate.php
+++ b/
includes/skins/BaseTemplate.php
@@
-33,6
+33,7
@@
abstract class BaseTemplate extends QuickTemplate {
*
* @param string $name Message name
* @param mixed $params,... Message params
*
* @param string $name Message name
* @param mixed $params,... Message params
+ * @suppress PhanCommentParamWithoutRealParam HHVM bug T228695#5450847
* @return Message
*/
public function getMsg( $name /* ... */ ) {
* @return Message
*/
public function getMsg( $name /* ... */ ) {
@@
-85,7
+86,7
@@
abstract class BaseTemplate extends QuickTemplate {
$toolbox['feeds']['links'][$key]['class'] = 'feedlink';
}
}
$toolbox['feeds']['links'][$key]['class'] = 'feedlink';
}
}
- foreach ( [ 'contributions', 'log', 'blockip', 'emailuser',
+ foreach ( [ 'contributions', 'log', 'blockip', 'emailuser',
'mute',
'userrights', 'upload', 'specialpages' ] as $special
) {
if ( isset( $this->data['nav_urls'][$special] ) && $this->data['nav_urls'][$special] ) {
'userrights', 'upload', 'specialpages' ] as $special
) {
if ( isset( $this->data['nav_urls'][$special] ) && $this->data['nav_urls'][$special] ) {
@@
-466,6
+467,10
@@
abstract class BaseTemplate extends QuickTemplate {
* @return string
*/
function makeListItem( $key, $item, $options = [] ) {
* @return string
*/
function makeListItem( $key, $item, $options = [] ) {
+ // In case this is still set from SkinTemplate, we don't want it to appear in
+ // the HTML output (normally removed in SkinTemplate::buildContentActionUrls())
+ unset( $item['redundant'] );
+
if ( isset( $item['links'] ) ) {
$links = [];
foreach ( $item['links'] as $linkKey => $link ) {
if ( isset( $item['links'] ) ) {
$links = [];
foreach ( $item['links'] as $linkKey => $link ) {