| Index: trunk/phase3/includes/filerepo/backend/FileBackendMultiWrite.php |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | // Set "files to lock" from the first batch so we don't try to set all |
| 85 | 85 | // locks two or three times over (depending on the number of backends). |
| 86 | 86 | // A lock on one storage path is a lock on all the backends. |
| 87 | | - foreach ( $performOps as $index => $fileOp ) { |
| | 87 | + foreach ( $performOps as $fileOp ) { |
| 88 | 88 | $filesLockSh = array_merge( $filesLockSh, $fileOp->storagePathsRead() ); |
| 89 | 89 | $filesLockEx = array_merge( $filesLockEx, $fileOp->storagePathsChanged() ); |
| 90 | 90 | } |
| — | — | @@ -297,7 +297,7 @@ |
| 298 | 298 | * @see FileBackendBase::getFileList() |
| 299 | 299 | */ |
| 300 | 300 | function getFileList( array $params ) { |
| 301 | | - foreach ( $this->backends as $index => $backend ) { |
| | 301 | + foreach ( $this->backends as $backend ) { |
| 302 | 302 | # Get results from the first backend |
| 303 | 303 | $realParams = $this->substOpPaths( $params, $backend ); |
| 304 | 304 | return $backend->getFileList( $realParams ); |
| Index: trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php |
| — | — | @@ -207,7 +207,7 @@ |
| 208 | 208 | $votesLeft = count( $this->srvsByBucket[$bucket] ); // remaining peers |
| 209 | 209 | $quorum = floor( $votesLeft/2 + 1 ); // simple majority |
| 210 | 210 | // Get votes for each peer, in order, until we have enough... |
| 211 | | - foreach ( $this->srvsByBucket[$bucket] as $index => $lockSrv ) { |
| | 211 | + foreach ( $this->srvsByBucket[$bucket] as $lockSrv ) { |
| 212 | 212 | // Attempt to acquire the lock on this peer |
| 213 | 213 | if ( !$this->doLockingRequest( $lockSrv, $paths, $type ) ) { |
| 214 | 214 | return 'cantacquire'; // vetoed; resource locked |
| — | — | @@ -284,7 +284,7 @@ |
| 285 | 285 | */ |
| 286 | 286 | function __destruct() { |
| 287 | 287 | $this->releaseLocks(); |
| 288 | | - foreach ( $this->conns as $lockSrv => $conn ) { |
| | 288 | + foreach ( $this->conns as $conn ) { |
| 289 | 289 | fclose( $conn ); |
| 290 | 290 | } |
| 291 | 291 | } |
| Index: trunk/phase3/includes/filerepo/backend/FSFileBackend.php |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | function __construct( array $config ) { |
| 28 | 28 | parent::__construct( $config ); |
| 29 | 29 | $this->containerPaths = (array)$config['containerPaths']; |
| 30 | | - foreach ( $this->containerPaths as $container => &$path ) { |
| | 30 | + foreach ( $this->containerPaths as &$path ) { |
| 31 | 31 | if ( substr( $path, -1 ) === '/' ) { |
| 32 | 32 | $path = substr( $path, 0, -1 ); // remove trailing slash |
| 33 | 33 | } |
| Index: trunk/phase3/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -813,7 +813,7 @@ |
| 814 | 814 | if ( empty( $opts['nonLocking'] ) ) { |
| 815 | 815 | // Build up a list of files to lock... |
| 816 | 816 | $filesLockEx = $filesLockSh = array(); |
| 817 | | - foreach ( $performOps as $index => $fileOp ) { |
| | 817 | + foreach ( $performOps as $fileOp ) { |
| 818 | 818 | $filesLockSh = array_merge( $filesLockSh, $fileOp->storagePathsRead() ); |
| 819 | 819 | $filesLockEx = array_merge( $filesLockEx, $fileOp->storagePathsChanged() ); |
| 820 | 820 | } |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1818,7 +1818,6 @@ |
| 1819 | 1819 | } |
| 1820 | 1820 | |
| 1821 | 1821 | if ( $this->section != '' && $this->section != 'new' ) { |
| 1822 | | - $matches = array(); |
| 1823 | 1822 | if ( !$this->summary && !$this->preview && !$this->diff ) { |
| 1824 | 1823 | $sectionTitle = self::extractSectionTitle( $this->textbox1 ); |
| 1825 | 1824 | if ( $sectionTitle !== false ) { |
| Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
| — | — | @@ -293,8 +293,6 @@ |
| 294 | 294 | $out->addHTML( $this->getForm( '' ) ); |
| 295 | 295 | return; |
| 296 | 296 | } |
| 297 | | - $nt = $userObj->getUserPage(); |
| 298 | | - $id = $userObj->getID(); |
| 299 | 297 | |
| 300 | 298 | $target = $userObj->getName(); |
| 301 | 299 | $out->addSubtitle( $this->getSubTitle( $userObj ) ); |