| Index: trunk/phase3/tests/phpunit/skins/SideBarTest.php |
| — | — | @@ -1,5 +1,8 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| | 4 | +/** |
| | 5 | + * @group Skin |
| | 6 | + */ |
| 4 | 7 | class SideBarTest extends MediaWikiLangTestCase { |
| 5 | 8 | |
| 6 | 9 | /** A skin template, reinitialized before each test */ |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1125,6 +1125,7 @@ |
| 1126 | 1126 | if ( strpos( $line, '*' ) !== 0 ) { |
| 1127 | 1127 | continue; |
| 1128 | 1128 | } |
| | 1129 | + $line = rtrim( $line, "\r" ); // for Windows compat |
| 1129 | 1130 | |
| 1130 | 1131 | if ( strpos( $line, '**' ) !== 0 ) { |
| 1131 | 1132 | $heading = trim( $line, '* ' ); |