aboutsummaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>2021-05-06 09:19:18 +0000
committerGerrit Code Review <gerrit@wikimedia.org>2021-05-06 09:19:18 +0000
commitc4456b0842222668b800c1c8ae3463ce2480963b (patch)
tree8ef3a2849ba6be3900a2d2e7b8b0624c653a6c93 /includes
parentd58e417207ff116038f40465bacb62b8d9c9e7d9 (diff)
parent5ae26812a28a3dd8de1eddd376174470cce81d11 (diff)
downloadmediawikicore-c4456b0842222668b800c1c8ae3463ce2480963b.tar.gz
mediawikicore-c4456b0842222668b800c1c8ae3463ce2480963b.zip
Merge "rdbms: use is_file() in DatabaseSqlite::open()"
Diffstat (limited to 'includes')
-rw-r--r--includes/libs/rdbms/database/DatabaseSqlite.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php
index d514e6171573..06ef27044499 100644
--- a/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@ -151,11 +151,7 @@ class DatabaseSqlite extends Database {
}
// Check if the database file already exists but is non-readable
- if (
- !self::isProcessMemoryPath( $path ) &&
- file_exists( $path ) &&
- !is_readable( $path )
- ) {
+ if ( !self::isProcessMemoryPath( $path ) && is_file( $path ) && !is_readable( $path ) ) {
throw $this->newExceptionAfterConnectError( 'SQLite database file is not readable' );
} elseif ( !in_array( $this->trxMode, self::$VALID_TRX_MODES, true ) ) {
throw $this->newExceptionAfterConnectError( "Got mode '{$this->trxMode}' for BEGIN" );