Merge "Decode Memcached keys before returning getMulti result"

[lhc/web/wiklou.git] / includes / Linker.php

diff --git a/includes/Linker.php b/includes/Linker.php
index 4d3f3ce..d6a4056 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -939,10 +939,7 @@ class Linker {
 
                        $href = self::getUploadUrl( $title, $query );
 
-                       // @todo FIXME: If we don't to escape apostrophes (single quotes) here (using ENT_QUOTES),
-                       // then double apostrophes will be parsed as italics somewhere later in the parser,
-                       // and break everything horribly
-                       return '<a href="' . htmlspecialchars( $href, ENT_QUOTES ) . '" class="new" title="' .
+                       return '<a href="' . htmlspecialchars( $href ) . '" class="new" title="' .
                                htmlspecialchars( $title->getPrefixedText(), ENT_QUOTES ) . '">' .
                                $encLabel . '</a>';
                }