| Index: trunk/phase3/includes/parser/Preprocessor_Hash.php |
| — | — | @@ -304,13 +304,11 @@ |
| 305 | 305 | |
| 306 | 306 | if ( $stack->top ) { |
| 307 | 307 | $part = $stack->top->getCurrentPart(); |
| 308 | | - if ( isset( $part->commentEnd ) && $part->commentEnd == $wsStart - 1 ) { |
| 309 | | - // Comments abutting, no change in visual end |
| 310 | | - $part->commentEnd = $wsEnd; |
| 311 | | - } else { |
| | 308 | + if ( ! (isset( $part->commentEnd ) && $part->commentEnd == $wsStart - 1 )) { |
| 312 | 309 | $part->visualEnd = $wsStart; |
| 313 | | - $part->commentEnd = $endPos; |
| 314 | 310 | } |
| | 311 | + // Else comments abutting, no change in visual end |
| | 312 | + $part->commentEnd = $endPos; |
| 315 | 313 | } |
| 316 | 314 | $i = $endPos + 1; |
| 317 | 315 | $inner = substr( $text, $startPos, $endPos - $startPos + 1 ); |
| Index: trunk/phase3/includes/parser/Preprocessor_DOM.php |
| — | — | @@ -343,11 +343,11 @@ |
| 344 | 344 | |
| 345 | 345 | if ( $stack->top ) { |
| 346 | 346 | $part = $stack->top->getCurrentPart(); |
| 347 | | - $part->commentEnd = $endPos; |
| 348 | 347 | if ( ! (isset( $part->commentEnd ) && $part->commentEnd == $wsStart - 1 )) { |
| 349 | 348 | $part->visualEnd = $wsStart; |
| 350 | 349 | } |
| 351 | 350 | // Else comments abutting, no change in visual end |
| | 351 | + $part->commentEnd = $endPos; |
| 352 | 352 | } |
| 353 | 353 | $i = $endPos + 1; |
| 354 | 354 | $inner = substr( $text, $startPos, $endPos - $startPos + 1 ); |