| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -149,11 +149,6 @@ |
| 150 | 150 | # NOTE: The stable version precedence cannot be configured per page with this. |
| 151 | 151 | $wgFlaggedRevsProtection = false; |
| 152 | 152 | |
| 153 | | -# Please set these as something different. Any text will do, though it probably |
| 154 | | -# shouldn't be very short (less secure) or very long (waste of resources). |
| 155 | | -# There must be two codes, and only the first two are checked. |
| 156 | | -$wgReviewCodes = array(); |
| 157 | | - |
| 158 | 153 | # URL location for flaggedrevs.css and flaggedrevs.js |
| 159 | 154 | # Use a literal $wgScriptPath as a placeholder for the runtime value of $wgScriptPath |
| 160 | 155 | $wgFlaggedRevsStylePath = '$wgScriptPath/extensions/FlaggedRevs/client'; |
| Index: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php |
| — | — | @@ -596,7 +596,7 @@ |
| 597 | 597 | wfProfileOut( __METHOD__ ); |
| 598 | 598 | return true; |
| 599 | 599 | } |
| 600 | | - |
| | 600 | + |
| 601 | 601 | /** |
| 602 | 602 | * Get a validation key from versioning metadata |
| 603 | 603 | * @param string $tmpP |
| — | — | @@ -606,15 +606,10 @@ |
| 607 | 607 | * @return string |
| 608 | 608 | */ |
| 609 | 609 | public static function validationKey( $tmpP, $imgP, $imgV, $rid ) { |
| 610 | | - global $wgReviewCodes; |
| 611 | | - # Fall back to $wgSecretKey/$wgProxyKey |
| 612 | | - if ( empty( $wgReviewCodes ) ) { |
| 613 | | - global $wgSecretKey, $wgProxyKey; |
| 614 | | - $key = $wgSecretKey ? $wgSecretKey : $wgProxyKey; |
| 615 | | - $p = md5( $key . $imgP . $tmpP . $rid . $imgV ); |
| 616 | | - } else { |
| 617 | | - $p = md5( $wgReviewCodes[0] . $imgP . $rid . $tmpP . $imgV . $wgReviewCodes[1] ); |
| 618 | | - } |
| | 610 | + global $wgSecretKey, $wgProxyKey; |
| | 611 | + # Fall back to $wgProxyKey |
| | 612 | + $key = $wgSecretKey ? $wgSecretKey : $wgProxyKey; |
| | 613 | + $p = md5( $key . $imgP . $tmpP . $rid . $imgV ); |
| 619 | 614 | return $p; |
| 620 | 615 | } |
| 621 | 616 | |