| Index: trunk/extensions/InterfaceConcurrency/includes/ConcurrencyCheck.php |
| — | — | @@ -61,8 +61,6 @@ |
| 62 | 62 | $userId = $this->user->getId(); |
| 63 | 63 | $cacheKey = wfMemcKey( 'concurrencycheck', $this->resourceType, $record ); |
| 64 | 64 | |
| 65 | | - global $wgInterfaceConcurrencyConfig; |
| 66 | | - |
| 67 | 65 | // check the cache first. |
| 68 | 66 | $cached = $wgMemc->get( $cacheKey ); |
| 69 | 67 | if ( $cached ) { |
| — | — | @@ -150,7 +148,7 @@ |
| 151 | 149 | } |
| 152 | 150 | |
| 153 | 151 | // replace is used here to support the override parameter |
| 154 | | - $res = $dbw->replace( |
| | 152 | + $dbw->replace( |
| 155 | 153 | 'concurrencycheck', |
| 156 | 154 | array( 'cc_resource_type', 'cc_record' ), |
| 157 | 155 | array( |
| — | — | @@ -413,7 +411,6 @@ |
| 414 | 412 | * attempted. |
| 415 | 413 | * |
| 416 | 414 | * @param $checkoutInfo array (optional) of checkout information to store |
| 417 | | - * @return array |
| 418 | 415 | */ |
| 419 | 416 | protected function setCheckoutResult( $checkoutInfo = array() ) { |
| 420 | 417 | $this->lastCheckout = $checkoutInfo; |