| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php |
| — | — | @@ -515,7 +515,7 @@ |
| 516 | 516 | * @param int $id Source revision Id |
| 517 | 517 | * @return ParserOutput |
| 518 | 518 | */ |
| 519 | | - public static function parseStableText( Title $title, $text, $id, $parserOptions = null ) { |
| | 519 | + public static function parseStableText( Title $title, $text, $id, $parserOptions ) { |
| 520 | 520 | global $wgParser; |
| 521 | 521 | # Notify Parser if includes should be stabilized |
| 522 | 522 | $resetManager = false; |
| — | — | @@ -532,8 +532,6 @@ |
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | # Parse the new body, wikitext -> html |
| 536 | | - if ( is_null( $parserOptions ) ) |
| 537 | | - $parserOptions = self::makeParserOptions(); // default options |
| 538 | 536 | $parserOut = $wgParser->parse( $text, $title, $parserOptions, true, true, $id ); |
| 539 | 537 | # Stable parse done! |
| 540 | 538 | if ( $resetManager ) { |
| Index: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php |
| — | — | @@ -891,6 +891,9 @@ |
| 892 | 892 | wfMsg( 'revreview-ak-review' ) . ']' |
| 893 | 893 | ) + ( ( $disabled || ( $frev && !$rereview ) ) ? $disAttrib : array() ) |
| 894 | 894 | ); |
| | 895 | + # UNDO BUTTON: revert from a pending revision to the stable |
| | 896 | + # @TODO... |
| | 897 | + |
| 895 | 898 | # UNACCEPT BUTTON: revoke a revisions acceptance |
| 896 | 899 | # Hide if revision is not flagged |
| 897 | 900 | $s .= ' '; |
| — | — | @@ -899,7 +902,7 @@ |
| 900 | 903 | 'name' => 'wpUnapprove', |
| 901 | 904 | 'id' => 'mw-fr-submitunreview', |
| 902 | 905 | 'title' => wfMsg( 'revreview-tt-unflag' ), |
| 903 | | - 'style' => $frev ? '' : 'visibility: hidden;' |
| | 906 | + 'style' => $frev ? '' : 'display:none;' |
| 904 | 907 | ) + ( $disabled ? $disAttrib : array() ) |
| 905 | 908 | ); |
| 906 | 909 | } else { |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -496,9 +496,9 @@ |
| 497 | 497 | # Check if this is a redirect... |
| 498 | 498 | $redirHtml = $this->getRedirectHtml( $text ); |
| 499 | 499 | if ( $redirHtml == '' ) { |
| | 500 | + $parserOptions = FlaggedRevs::makeParserOptions(); |
| 500 | 501 | $parserOut = FlaggedRevs::parseStableText( |
| 501 | | - $this->article->getTitle(), $text, $frev->getRevId(), |
| 502 | | - FlaggedRevs::makeParserOptions() ); |
| | 502 | + $this->article->getTitle(), $text, $frev->getRevId(), $parserOptions ); |
| 503 | 503 | } |
| 504 | 504 | # Construct some tagging for non-printable outputs. Note that the pending |
| 505 | 505 | # notice has all this info already, so don't do this if we added that already. |