From 71d5b68221002d71c88783acab7df267a4e04cec Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Tue, 18 Oct 2011 21:09:52 +0000 Subject: [PATCH] =?utf8?q?revert=20r99562=20and=20set=20standard=5Fconform?= =?utf8?q?ing=5Fstrings=20=E2=80=9Con=E2=80=9D=20by=20default?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- includes/db/DatabasePostgres.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index 1b0539c14b..8974dc8990 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -200,6 +200,7 @@ class DatabasePostgres extends DatabaseBase { $this->query( "SET client_encoding='UTF8'", __METHOD__ ); $this->query( "SET datestyle = 'ISO, YMD'", __METHOD__ ); $this->query( "SET timezone = 'GMT'", __METHOD__ ); + $this->query( "SET standard_conforming_strings = on", __METHOD__ ); global $wgDBmwschema; if ( $this->schemaExists( $wgDBmwschema ) ) { @@ -878,11 +879,7 @@ SQL; } elseif ( is_bool( $s ) ) { return intval( $s ); } elseif ( $s instanceof Blob ) { - $ret = "'" . $s->fetch( $s ) . "'"; - if ( $this->numeric_version >= 8.1 ) { - $ret = "E$ret"; - } - return $ret; + return "'" . $s->fetch( $s ) . "'"; } return "'" . pg_escape_string( $this->mConn, $s ) . "'"; } -- 2.20.1