Initialise wgDBadminuser and wgDBadminpassword to null in DefaultSettings.php, to...

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

diff --git a/includes/Linker.php b/includes/Linker.php
index 821611d..a25013b 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1941,6 +1941,9 @@ class Linker {
         * @deprecated Returns raw bits of HTML, use titleAttrib() and accesskey()
         */
        public function tooltipAndAccesskey( $name ) {
+               global $wgDisableTooltipsAndAccesskeys;
+               if ($wgDisableTooltipsAndAccesskeys)
+                       return array();
                # FIXME: If Sanitizer::expandAttributes() treated "false" as "output
                # no attribute" instead of "output '' as value for attribute", this
                # would be three lines.
@@ -1959,6 +1962,9 @@ class Linker {
 
        /** @deprecated Returns raw bits of HTML, use titleAttrib() */
        public function tooltip( $name, $options = null ) {
+               global $wgDisableTooltipsAndAccesskeys;
+               if ($wgDisableTooltipsAndAccesskeys)
+                       return array();
                # FIXME: If Sanitizer::expandAttributes() treated "false" as "output
                # no attribute" instead of "output '' as value for attribute", this
                # would be two lines.