Index: trunk/phase3/maintenance/parserTests.inc |
— | — | @@ -257,7 +257,9 @@ |
258 | 258 | if (preg_match('/\\bill\\b/i', $opts)) { |
259 | 259 | $out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) ); |
260 | 260 | } else if (preg_match('/\\bcat\\b/i', $opts)) { |
261 | | - $out = $this->tidy ( implode( ' ', $output->getCategoryLinks() ) ); |
| 261 | + global $wgOut; |
| 262 | + $wgOut->addCategoryLinks($output->getCategories()); |
| 263 | + $out = $this->tidy ( implode( ' ', $wgOut->getCategoryLinks() ) ); |
262 | 264 | } |
263 | 265 | |
264 | 266 | $result = $this->tidy($result); |
— | — | @@ -497,6 +499,8 @@ |
498 | 500 | unlink( "$dir/3/3a/Foobar.jpg" ); |
499 | 501 | rmdir( "$dir/3/3a" ); |
500 | 502 | rmdir( "$dir/3" ); |
| 503 | + @rmdir( "$dir/thumb/6/65" ); |
| 504 | + @rmdir( "$dir/thumb/6" ); |
501 | 505 | |
502 | 506 | @unlink( "$dir/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" ); |
503 | 507 | @rmdir( "$dir/thumb/3/3a/Foobar.jpg" ); |