Log startAtomic()/endAtomic() to the query logger

[lhc/web/wiklou.git] / includes / filebackend / FileBackendGroup.php

diff --git a/includes/filebackend/FileBackendGroup.php b/includes/filebackend/FileBackendGroup.php
index 454b633..503acdc 100644 (file)
--- a/includes/filebackend/FileBackendGroup.php
+++ b/includes/filebackend/FileBackendGroup.php
@@ -79,15 +79,9 @@ class FileBackendGroup {
                        $repoName = $info['name'];
                        // Local vars that used to be FSRepo members...
                        $directory = $info['directory'];
-                       $deletedDir = isset( $info['deletedDir'] )
-                               ? $info['deletedDir']
-                               : false; // deletion disabled
-                       $thumbDir = isset( $info['thumbDir'] )
-                               ? $info['thumbDir']
-                               : "{$directory}/thumb";
-                       $transcodedDir = isset( $info['transcodedDir'] )
-                               ? $info['transcodedDir']
-                               : "{$directory}/transcoded";
+                       $deletedDir = $info['deletedDir'] ?? false; // deletion disabled
+                       $thumbDir = $info['thumbDir'] ?? "{$directory}/thumb";
+                       $transcodedDir = $info['transcodedDir'] ?? "{$directory}/transcoded";
                        // Get the FS backend configuration
                        $autoBackends[] = [
                                'name' => $backendName,
@@ -100,7 +94,7 @@ class FileBackendGroup {
                                        "{$repoName}-deleted" => $deletedDir,
                                        "{$repoName}-temp" => "{$directory}/temp"
                                ],
-                               'fileMode' => isset( $info['fileMode'] ) ? $info['fileMode'] : 0644,
+                               'fileMode' => $info['fileMode'] ?? 0644,
                                'directoryMode' => $wgDirectoryMode,
                        ];
                }
@@ -129,9 +123,7 @@ class FileBackendGroup {
                        }
                        $class = $config['class'];
 
-                       $config['readOnly'] = !empty( $config['readOnly'] )
-                               ? $config['readOnly']
-                               : $readOnlyReason;
+                       $config['readOnly'] = $config['readOnly'] ?? $readOnlyReason;
 
                        unset( $config['class'] ); // backend won't need this
                        $this->backends[$name] = [