| Index: branches/wmf/1.16wmf4/includes/Math.php |
| — | — | @@ -37,7 +37,8 @@ |
| 38 | 38 | |
| 39 | 39 | if( $this->mode == MW_MATH_SOURCE ) { |
| 40 | 40 | # No need to render or parse anything more! |
| 41 | | - return ('$ '.htmlspecialchars( $this->tex ).' $'); |
| | 41 | + # New lines are replaced with spaces, which avoids confusing our parser (bugs 23190, 22818) |
| | 42 | + return ('<span class="tex">$ ' . str_replace( "\n", " ", htmlspecialchars( $this->tex ) ) . ' $</span>'); |
| 42 | 43 | } |
| 43 | 44 | if( $this->tex == '' ) { |
| 44 | 45 | return; # bug 8372 |
| Property changes on: branches/wmf/1.16wmf4/includes/Math.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 45 | 46 | Merged /branches/wmf-deployment/includes/Math.php:r53381,60970 |
| 46 | 47 | Merged /branches/REL1_15/phase3/includes/Math.php:r51646 |
| 47 | 48 | Merged /branches/sqlite/includes/Math.php:r58211-58321 |
| 48 | 49 | Merged /trunk/phase3/includes/Math.php:r63549,63764,63897-63901,64113,64509,65039,65160,65387,65391,65555,65590,65650,65816,71059,71098,71942,72024,72120,72525 |