| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -255,7 +255,7 @@ |
| 256 | 256 | $wgAvailableRights[] = 'stablesettings'; |
| 257 | 257 | |
| 258 | 258 | # Bump this number every time you change flaggedrevs.css/flaggedrevs.js |
| 259 | | -$wgFlaggedRevStyleVersion = 80; |
| | 259 | +$wgFlaggedRevStyleVersion = 81; |
| 260 | 260 | |
| 261 | 261 | $wgExtensionFunctions[] = 'efLoadFlaggedRevs'; |
| 262 | 262 | |
| Property changes on: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 263 | 263 | Merged /trunk/extensions/FlaggedRevs/language:r76877-76878 |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.hooks.php |
| — | — | @@ -110,7 +110,6 @@ |
| 111 | 111 | $stableId = null; |
| 112 | 112 | } |
| 113 | 113 | $globalVars['wgStableRevisionId'] = $stableId; |
| 114 | | - $globalVars['wgLatestRevisionId'] = $fa->getLatest(); |
| 115 | 114 | $revisionContents = (object) array( |
| 116 | 115 | 'error' => wfMsgHtml( 'revcontents-error' ), |
| 117 | 116 | 'waiting' => wfMsgHtml( 'revcontents-waiting' ) |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/flaggedrevs.js |
| — | — | @@ -194,8 +194,8 @@ |
| 195 | 195 | var origContents = contentsDiv.innerHTML; |
| 196 | 196 | contentsDiv.innerHTML = "<span class='loading mw-small-spinner spinner'></span><span class='loading' >" + wgRevContents.waiting + "</span>"; |
| 197 | 197 | var requestArgs = 'action=parse&prop=text&format=xml'; |
| 198 | | - if ( window.wgLatestRevisionId == oldRevId && window.wgPageName ) { |
| 199 | | - requestArgs += '&page=' + window.wgPageName; |
| | 198 | + if ( window.wgCurRevisionId == oldRevId && window.wgPageName ) { |
| | 199 | + requestArgs += '&page=' + encodeURIComponent( window.wgPageName ); |
| 200 | 200 | } else { |
| 201 | 201 | requestArgs += '&oldid=' + oldRevId; |
| 202 | 202 | } |
| Property changes on: branches/chad-pre-wmf-merge/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 203 | 203 | Merged /trunk/extensions/FlaggedRevs:r76877-76878 |