| Index: branches/wmf-deployment/includes/Linker.php |
| — | — | @@ -1942,8 +1942,8 @@ |
| 1943 | 1943 | */ |
| 1944 | 1944 | public function tooltipAndAccesskey( $name ) { |
| 1945 | 1945 | global $wgEnableTooltipsAndAccesskeys; |
| 1946 | | - if (!$wgEnableTooltipsAndAccesskeys) |
| 1947 | | - return array(); |
| | 1946 | + if ( !$wgEnableTooltipsAndAccesskeys ) |
| | 1947 | + return ''; |
| 1948 | 1948 | # FIXME: If Sanitizer::expandAttributes() treated "false" as "output |
| 1949 | 1949 | # no attribute" instead of "output '' as value for attribute", this |
| 1950 | 1950 | # would be three lines. |
| — | — | @@ -1963,7 +1963,7 @@ |
| 1964 | 1964 | /** @deprecated Returns raw bits of HTML, use titleAttrib() */ |
| 1965 | 1965 | public function tooltip( $name, $options = null ) { |
| 1966 | 1966 | global $wgEnableTooltipsAndAccesskeys; |
| 1967 | | - if ($wgEnableTooltipsAndAccesskeys) |
| | 1967 | + if ( !$wgEnableTooltipsAndAccesskeys ) |
| 1968 | 1968 | return ''; |
| 1969 | 1969 | # FIXME: If Sanitizer::expandAttributes() treated "false" as "output |
| 1970 | 1970 | # no attribute" instead of "output '' as value for attribute", this |
| Property changes on: branches/wmf-deployment/includes/Linker.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1971 | 1971 | + /branches/REL1_15/phase3/includes/Linker.php:51646 |
| /branches/wmf-deployment/includes/Linker.php:53381 |
| /trunk/phase3/includes/Linker.php:56174,56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56514 |