| Index: branches/wmf/1.17wmf1/includes/diff/DifferenceEngine.php |
| — | — | @@ -724,7 +724,7 @@ |
| 725 | 725 | # input text to be HTML-escaped already |
| 726 | 726 | $otext = htmlspecialchars ( $wgContLang->segmentForDiff( $otext ) ); |
| 727 | 727 | $ntext = htmlspecialchars ( $wgContLang->segmentForDiff( $ntext ) ); |
| 728 | | - return $wgContLang->unsegementForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ) . |
| | 728 | + return $wgContLang->unsegmentForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) ) . |
| 729 | 729 | $this->debug( 'wikidiff1' ); |
| 730 | 730 | } |
| 731 | 731 | |
| Property changes on: branches/wmf/1.17wmf1/includes/diff/DifferenceEngine.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 732 | 732 | Merged /branches/new-installer/phase3/includes/diff/DifferenceEngine.php:r43664-66004 |
| 733 | 733 | Merged /branches/wmf-deployment/includes/diff/DifferenceEngine.php:r53381,60970 |
| 734 | 734 | Merged /branches/REL1_15/phase3/includes/diff/DifferenceEngine.php:r51646 |
| 735 | 735 | Merged /branches/wmf/1.16wmf4/includes/diff/DifferenceEngine.php:r67177,69199,76243,77266 |
| 736 | 736 | Merged /branches/sqlite/includes/diff/DifferenceEngine.php:r58211-58321 |
| 737 | 737 | Merged /trunk/phase3/includes/diff/DifferenceEngine.php:r83590,86394 |