X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ffilebackend%2FSwiftFileBackend.php;h=f40ec46e2c96229daf7b0729592ff2a4415362bb;hb=d98fd55e11dc6ab9f04d4810985b04ca39dfc3dd;hp=9ef23f84725aa0bd278db3aac03de27068eb743d;hpb=d434013a98e7dd517067f5ca9c263b1d4d8bd6ee;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php
index 9ef23f8472..f40ec46e2c 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -173,7 +173,7 @@ class SwiftFileBackend extends FileBackendStore {
 	 * Sanitize and filter the custom headers from a $params array.
 	 * We only allow certain Content- and X-Content- headers.
 	 *
-	 * @param array $headers
+	 * @param array $params
 	 * @return array Sanitized value of 'headers' field in $params
 	 */
 	protected function sanitizeHdrs( array $params ) {
@@ -1521,7 +1521,7 @@ class SwiftFileBackend extends FileBackendStore {
 					'mtime' => $this->convertSwiftDate( $rhdrs['last-modified'], TS_MW ),
 					// Empty objects actually return no content-length header in Ceph
 					'size'  => isset( $rhdrs['content-length'] ) ? (int)$rhdrs['content-length'] : 0,
-					'sha1'  => $rhdrs[ 'x-object-meta-sha1base36'],
+					'sha1'  => $rhdrs['x-object-meta-sha1base36'],
 					// Note: manifiest ETags are not an MD5 of the file
 					'md5'   => ctype_xdigit( $rhdrs['etag'] ) ? $rhdrs['etag'] : null,
 					'xattr' => array( 'metadata' => $metadata, 'headers' => $headers )
@@ -1791,7 +1791,7 @@ abstract class SwiftFileBackendList implements Iterator {
 	 *
 	 * @param string $container Resolved container name
 	 * @param string $dir Resolved path relative to container
-	 * @param string $after null
+	 * @param string $after
 	 * @param int $limit
 	 * @param array $params
 	 * @return Traversable|array