| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -211,7 +211,7 @@ |
| 212 | 212 | # Show reviews in recentchanges? Disabled by default, often spammy... |
| 213 | 213 | $wgFlaggedRevsLogInRC = false; |
| 214 | 214 | # Show automatic promotions to Editor in RC? Disabled by default, often spammy... |
| 215 | | -$wgFlaggedRevsAutopromoteInRC = false; |
| | 215 | +$wgFlaggedRevsAutopromoteInRC = false; // @TODO: remove when ready |
| 216 | 216 | |
| 217 | 217 | # How far the logs for overseeing quality revisions and depreciations go |
| 218 | 218 | $wgFlaggedRevsOversightAge = 30 * 24 * 3600; |
| — | — | @@ -226,9 +226,9 @@ |
| 227 | 227 | # FR_INCLUDES_FREEZE |
| 228 | 228 | # Use the version of templates/files that the page used when reviewed |
| 229 | 229 | # FR_INCLUDES_STABLE |
| 230 | | -# Use the stable version of templates/files that themselves have a stable version |
| 231 | | -# and the template/file version used at the time of review for those that don't have one |
| 232 | | -# NOTE: We may have templates that do not have stable version. Given situational |
| | 230 | +# For each template/file, check if a version of it was used when the page was reviewed |
| | 231 | +# and if the template/file itself has a stable version; use the newest those versions |
| | 232 | +# NOTE: We may have templates that do not have stable version. Also, given situational |
| 233 | 233 | # inclusion of templates (e.g. parser functions selecting template X or Y based on date), |
| 234 | 234 | # there may also be no "review time version" revision ID for a template used on a page. |
| 235 | 235 | # In such cases, we select the current (unreviewed) revision. Likewise for files. |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1255,13 +1255,13 @@ |
| 1256 | 1256 | |
| 1257 | 1257 | /** |
| 1258 | 1258 | * Adds a notice saying that this revision is pending review |
| 1259 | | - * @param FlaggedRevision $frev |
| | 1259 | + * @param FlaggedRevision $srev The stable version |
| 1260 | 1260 | * @return void |
| 1261 | 1261 | */ |
| 1262 | | - public function setPendingNotice( FlaggedRevision $frev ) { |
| | 1262 | + public function setPendingNotice( FlaggedRevision $srev ) { |
| 1263 | 1263 | global $wgLang; |
| 1264 | 1264 | $this->load(); |
| 1265 | | - $time = $wgLang->date( $frev->getTimestamp(), true ); |
| | 1265 | + $time = $wgLang->date( $srev->getTimestamp(), true ); |
| 1266 | 1266 | $pendingNotice = wfMsgExt( 'revreview-pendingnotice', 'parseinline', $time ); |
| 1267 | 1267 | $this->reviewNotice .= "<div id='mw-fr-reviewnotice' class='flaggedrevs_preview plainlinks'>" . |
| 1268 | 1268 | $pendingNotice . "</div>"; |