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 "EditPage: Don't use $wgOut"
[lhc/web/wiklou.git]
/
includes
/
Linker.php
diff --git
a/includes/Linker.php
b/includes/Linker.php
index
2ca851c
..
aedb704
100644
(file)
--- a/
includes/Linker.php
+++ b/
includes/Linker.php
@@
-154,6
+154,11
@@
class Linker {
* @since 1.16.3
* @deprecated since 1.28, use MediaWiki\Linker\LinkRenderer instead
* @see Linker::link
* @since 1.16.3
* @deprecated since 1.28, use MediaWiki\Linker\LinkRenderer instead
* @see Linker::link
+ * @param Title $target
+ * @param string $html
+ * @param array $customAttribs
+ * @param array $query
+ * @param string|array $options
* @return string
*/
public static function linkKnown(
* @return string
*/
public static function linkKnown(
@@
-1350,7
+1355,7
@@
class Linker {
/**
* @param Title $contextTitle
* @param string $target
/**
* @param Title $contextTitle
* @param string $target
- * @param string $text
+ * @param string
&
$text
* @return string
*/
public static function normalizeSubpageLink( $contextTitle, $target, &$text ) {
* @return string
*/
public static function normalizeSubpageLink( $contextTitle, $target, &$text ) {
@@
-1619,14
+1624,16
@@
class Linker {
$link, $fallbackAnchor = false
) {
$anchorEscaped = htmlspecialchars( $anchor );
$link, $fallbackAnchor = false
) {
$anchorEscaped = htmlspecialchars( $anchor );
- $ret = "<h$level$attribs"
- . "<span class=\"mw-headline\" id=\"$anchorEscaped\">$html</span>"
- . $link
- . "</h$level>";
+ $fallback = '';
if ( $fallbackAnchor !== false && $fallbackAnchor !== $anchor ) {
$fallbackAnchor = htmlspecialchars( $fallbackAnchor );
if ( $fallbackAnchor !== false && $fallbackAnchor !== $anchor ) {
$fallbackAnchor = htmlspecialchars( $fallbackAnchor );
- $
ret = "<div id=\"$fallbackAnchor\"></div>$ret
";
+ $
fallback = "<span id=\"$fallbackAnchor\"></span>
";
}
}
+ $ret = "<h$level$attribs"
+ . "$fallback<span class=\"mw-headline\" id=\"$anchorEscaped\">$html</span>"
+ . $link
+ . "</h$level>";
+
return $ret;
}
return $ret;
}