Merge "installer: Choose CACHE_ACCEL as the default if available"

[lhc/web/wiklou.git] / maintenance / dumpUploads.php

diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php
index 0ec1955..026ac02 100644 (file)
--- a/maintenance/dumpUploads.php
+++ b/maintenance/dumpUploads.php
@@ -64,7 +64,7 @@ By default, outputs relative paths against the parent directory of \$wgUploadDir
                                $this->mSharedSupplement = true;
                        }
                }
-               $this->{ $this->mAction } ( $this->mShared );
+               $this->{$this->mAction} ( $this->mShared );
                if ( $this->mSharedSupplement ) {
                        $this->fetchUsed( true );
                }
@@ -73,10 +73,10 @@ By default, outputs relative paths against the parent directory of \$wgUploadDir
        /**
         * Fetch a list of used images from a particular image source.
         *
-        * @param $shared Boolean: true to pass shared-dir settings to hash func
+        * @param bool $shared True to pass shared-dir settings to hash func
         */
        function fetchUsed( $shared ) {
-               $dbr = wfGetDB( DB_SLAVE );
+               $dbr = $this->getDB( DB_SLAVE );
                $image = $dbr->tableName( 'image' );
                $imagelinks = $dbr->tableName( 'imagelinks' );
 
@@ -94,10 +94,10 @@ By default, outputs relative paths against the parent directory of \$wgUploadDir
        /**
         * Fetch a list of all images from a particular image source.
         *
-        * @param $shared Boolean: true to pass shared-dir settings to hash func
+        * @param bool $shared True to pass shared-dir settings to hash func
         */
        function fetchLocal( $shared ) {
-               $dbr = wfGetDB( DB_SLAVE );
+               $dbr = $this->getDB( DB_SLAVE );
                $result = $dbr->select( 'image',
                        array( 'img_name' ),
                        '',