| Index: branches/wmf/1.19wmf1/includes/Skin.php |
| — | — | @@ -1499,7 +1499,7 @@ |
| 1500 | 1500 | if ( !is_null( $tooltip ) ) { |
| 1501 | 1501 | # Bug 25462: undo double-escaping. |
| 1502 | 1502 | $tooltip = Sanitizer::decodeCharReferences( $tooltip ); |
| 1503 | | - $attribs['title'] = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag' ), $tooltip ); |
| | 1503 | + $attribs['title'] = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag', 'replaceafter' ), $tooltip ); |
| 1504 | 1504 | } |
| 1505 | 1505 | $link = Linker::link( $nt, wfMsgExt( 'editsection', array( 'language' => $lang ) ), |
| 1506 | 1506 | $attribs, |
| — | — | @@ -1511,7 +1511,7 @@ |
| 1512 | 1512 | # we can rid of it someday. |
| 1513 | 1513 | $attribs = ''; |
| 1514 | 1514 | if ( $tooltip ) { |
| 1515 | | - $attribs = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag', 'escape' ), $tooltip ); |
| | 1515 | + $attribs = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag', 'escape', 'replaceafter' ), $tooltip ); |
| 1516 | 1516 | $attribs = " title=\"$attribs\""; |
| 1517 | 1517 | } |
| 1518 | 1518 | $result = null; |
| Property changes on: branches/wmf/1.19wmf1/includes/Skin.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1519 | 1519 | Merged /branches/REL1_15/phase3/includes/Skin.php:r51646 |
| 1520 | 1520 | Merged /branches/wmf/1.18wmf1/includes/Skin.php:r97508,111667 |
| 1521 | 1521 | Merged /branches/sqlite/includes/Skin.php:r58211-58321 |
| 1522 | 1522 | Merged /trunk/phase3/includes/Skin.php:r111029,111034,111067,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112347,112374,112378,112381,112383,112395,112397,112408,112474,112526,112534,112563,112700,112839-112840,112843,112855,112866,112951 |
| 1523 | 1523 | Merged /branches/new-installer/phase3/includes/Skin.php:r43664-66004 |
| 1524 | 1524 | Merged /branches/wmf-deployment/includes/Skin.php:r53381 |
| 1525 | 1525 | Merged /branches/JSTesting/includes/Skin.php:r100352-107913 |