Merge "filebackend: clean up some comments and remove unused FileBackendStoreOpHandle...

diff --git a/includes/libs/filebackend/FileBackendStore.php b/includes/libs/filebackend/FileBackendStore.php
index f2c07e8..5caf250 100644 (file)
--- a/includes/libs/filebackend/FileBackendStore.php
+++ b/includes/libs/filebackend/FileBackendStore.php
@@ -1587,7 +1587,7 @@ abstract class FileBackendStore extends FileBackend {
                                // Validate and sanitize the relative path (backend-specific)
                                $relPath = $this->resolveContainerPath( $shortCont, $relPath );
                                if ( $relPath !== null ) {
-                                       // Prepend any wiki ID prefix to the container name
+                                       // Prepend any domain ID prefix to the container name
                                        $container = $this->fullContainerName( $shortCont );
                                        if ( self::isValidContainerName( $container ) ) {
                                                // Validate and sanitize the container name (backend-specific)
@@ -1722,7 +1722,7 @@ abstract class FileBackendStore extends FileBackend {
        }
 
        /**
-        * Get the full container name, including the wiki ID prefix
+        * Get the full container name, including the domain ID prefix
         *
         * @param string $container
         * @return string

diff --git a/includes/libs/filebackend/fileophandle/FileBackendStoreOpHandle.php b/includes/libs/filebackend/fileophandle/FileBackendStoreOpHandle.php
index c366a0f..649225d 100644 (file)
--- a/includes/libs/filebackend/fileophandle/FileBackendStoreOpHandle.php
+++ b/includes/libs/filebackend/fileophandle/FileBackendStoreOpHandle.php
@@ -35,8 +35,6 @@ abstract class FileBackendStoreOpHandle {
        /** @var array */
        public $resourcesToClose = [];
 
-       public $call; // string; name that identifies the function called
-
        /**
         * Close all open file handles
         */