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 canonical id to header on action=info"
[lhc/web/wiklou.git]
/
includes
/
Linker.php
diff --git
a/includes/Linker.php
b/includes/Linker.php
index
b133ecd
..
f2e4ac4
100644
(file)
--- a/
includes/Linker.php
+++ b/
includes/Linker.php
@@
-1331,7
+1331,10
@@
class Linker {
$link = Linker::makeExternalLink(
WikiMap::getForeignURL(
$wikiId,
$link = Linker::makeExternalLink(
WikiMap::getForeignURL(
$wikiId,
- $title->getPrefixedText(),
+ $title->getNamespace() === 0
+ ? $title->getDBkey()
+ : MWNamespace::getCanonicalName( $title->getNamespace() ) . ':'
+ . $title->getDBkey(),
$title->getFragment()
),
$text,
$title->getFragment()
),
$text,
@@
-1882,7
+1885,6
@@
class Linker {
* @return string HTML output
*/
public static function formatHiddenCategories( $hiddencats ) {
* @return string HTML output
*/
public static function formatHiddenCategories( $hiddencats ) {
-
$outText = '';
if ( count( $hiddencats ) > 0 ) {
# Construct the HTML
$outText = '';
if ( count( $hiddencats ) > 0 ) {
# Construct the HTML
@@
-2094,9
+2096,6
@@
class Linker {
* @return array
*/
public static function tooltipAndAccesskeyAttribs( $name, array $msgParams = [] ) {
* @return array
*/
public static function tooltipAndAccesskeyAttribs( $name, array $msgParams = [] ) {
- # @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
- # no attribute" instead of "output '' as value for attribute", this
- # would be three lines.
$attribs = [
'title' => self::titleAttrib( $name, 'withaccess', $msgParams ),
'accesskey' => self::accesskey( $name )
$attribs = [
'title' => self::titleAttrib( $name, 'withaccess', $msgParams ),
'accesskey' => self::accesskey( $name )
@@
-2118,9
+2117,6
@@
class Linker {
* @return null|string
*/
public static function tooltip( $name, $options = null ) {
* @return null|string
*/
public static function tooltip( $name, $options = null ) {
- # @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
- # no attribute" instead of "output '' as value for attribute", this
- # would be two lines.
$tooltip = self::titleAttrib( $name, $options );
if ( $tooltip === false ) {
return '';
$tooltip = self::titleAttrib( $name, $options );
if ( $tooltip === false ) {
return '';