| Index: trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php |
| — | — | @@ -504,11 +504,10 @@ |
| 505 | 505 | $oldfrev->getRevText(), $oldfrev->getRevId() ); |
| 506 | 506 | } |
| 507 | 507 | |
| 508 | | - # Be looser on includes for templates, since they don't matter much |
| 509 | | - # and strict checking breaks randomized images/metatemplates...(bug 14580) |
| | 508 | + # Be loose on templates that includes other files/templates dynamically. |
| | 509 | + # Strict checking breaks randomized images/metatemplates...(bug 14580) |
| 510 | 510 | global $wgUseCurrentTemplates, $wgUseCurrentImages; |
| 511 | | - $noMatch = ( $rev->getTitle()->getNamespace() == NS_TEMPLATE |
| 512 | | - && $wgUseCurrentTemplates && $wgUseCurrentImages ); |
| | 511 | + $mustMatch = !( $wgUseCurrentTemplates && $wgUseCurrentImages ); |
| 513 | 512 | |
| 514 | 513 | # Set our versioning params cache |
| 515 | 514 | FlaggedRevs::setIncludeVersionCache( $rev->getId(), $tmpParams, $imgParams ); |
| — | — | @@ -516,7 +515,7 @@ |
| 517 | 516 | $text = $rev->getText(); |
| 518 | 517 | $stableOutput = FlaggedRevs::parseStableText( $article, $text, $rev->getId() ); |
| 519 | 518 | $err =& $stableOutput->fr_includeErrors; |
| 520 | | - if ( !$noMatch ) { // template/files must all be specified |
| | 519 | + if ( $mustMatch ) { // if template/files must all be specified... |
| 521 | 520 | if ( !empty( $err ) |
| 522 | 521 | || $stableOutput->fr_newestImageTime > $lastImgTime |
| 523 | 522 | || $stableOutput->fr_newestTemplateID > $lastTempId ) |