From 45e2a556daf789cb406e9d3967a4e4e6e6861a6e Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 6 Jan 2014 19:24:44 +0100 Subject: [PATCH] Rename $desired_schema to $desiredSchema Change-Id: I0f421964e94c95ead931bf8c9faa1667dc2f7e06 --- includes/db/DatabasePostgres.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index af48254ce7..3e58c66446 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -1253,14 +1253,15 @@ __INDEXATTR__; * This will be also called by the installer after the schema is created * * @since 1.19 - * @param string $desired_schema + * + * @param string $desiredSchema */ - function determineCoreSchema( $desired_schema ) { + function determineCoreSchema( $desiredSchema ) { $this->begin( __METHOD__ ); - if ( $this->schemaExists( $desired_schema ) ) { - if ( in_array( $desired_schema, $this->getSchemas() ) ) { - $this->mCoreSchema = $desired_schema; - wfDebug( "Schema \"" . $desired_schema . "\" already in the search path\n" ); + if ( $this->schemaExists( $desiredSchema ) ) { + if ( in_array( $desiredSchema, $this->getSchemas() ) ) { + $this->mCoreSchema = $desiredSchema; + wfDebug( "Schema \"" . $desiredSchema . "\" already in the search path\n" ); } else { /** * Prepend our schema (e.g. 'mediawiki') in front @@ -1269,14 +1270,14 @@ __INDEXATTR__; */ $search_path = $this->getSearchPath(); array_unshift( $search_path, - $this->addIdentifierQuotes( $desired_schema ) ); + $this->addIdentifierQuotes( $desiredSchema ) ); $this->setSearchPath( $search_path ); - $this->mCoreSchema = $desired_schema; - wfDebug( "Schema \"" . $desired_schema . "\" added to the search path\n" ); + $this->mCoreSchema = $desiredSchema; + wfDebug( "Schema \"" . $desiredSchema . "\" added to the search path\n" ); } } else { $this->mCoreSchema = $this->getCurrentSchema(); - wfDebug( "Schema \"" . $desired_schema . "\" not found, using current \"" . + wfDebug( "Schema \"" . $desiredSchema . "\" not found, using current \"" . $this->mCoreSchema . "\"\n" ); } /* Commit SET otherwise it will be rollbacked on error or IGNORE SELECT */ -- 2.20.1