From 70f749ba7575d830479d99193d2e45a0a901db79 Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Sun, 10 Jan 2010 23:24:47 +0000 Subject: [PATCH] Use string interpolation, not . Prompted by r60731, although that didn't actually add the concatenation (which should have had more spaces, too). --- includes/db/DatabaseOracle.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index f4ef519306..cabc958f80 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -833,7 +833,7 @@ class DatabaseOracle extends DatabaseBase { function fieldExists( $table, $field, $fname = 'DatabaseOracle::fieldExists' ) { $table = trim( $table, '"' ); - if (isset($this->mFieldInfoCache[$table.'.'.$field])) { + if (isset($this->mFieldInfoCache["$table.$field"])) { return true; } elseif ( !isset( $this->fieldInfo_stmt ) ) { $this->fieldInfo_stmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)' ); @@ -849,7 +849,7 @@ class DatabaseOracle extends DatabaseBase { } $res = new ORAResult( $this, $this->fieldInfo_stmt ); if ($res->numRows() != 0) { - $this->mFieldInfoCache[$table.'.'.$field] = new ORAField( $res->fetchRow() ); + $this->mFieldInfoCache["$table.$field"] = new ORAField( $res->fetchRow() ); return true; } else { return false; @@ -859,8 +859,8 @@ class DatabaseOracle extends DatabaseBase { function fieldInfo( $table, $field ) { $table = trim( $table, '"' ); - if (isset($this->mFieldInfoCache[$table.'.'.$field])) { - return $this->mFieldInfoCache[$table.'.'.$field]; + if (isset($this->mFieldInfoCache["$table.$field"])) { + return $this->mFieldInfoCache["$table.$field"]; } elseif ( !isset( $this->fieldInfo_stmt ) ) { $this->fieldInfo_stmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)' ); } @@ -874,8 +874,8 @@ class DatabaseOracle extends DatabaseBase { return false; } $res = new ORAResult( $this, $this->fieldInfo_stmt ); - $this->mFieldInfoCache[$table.'.'.$field] = new ORAField( $res->fetchRow() ); - return $this->mFieldInfoCache[$table.'.'.$field]; + $this->mFieldInfoCache["$table.$field"] = new ORAField( $res->fetchRow() ); + return $this->mFieldInfoCache["$table.$field"]; } function begin( $fname = '' ) { -- 2.20.1