diff options
| author | chriskl | 2005-11-22 01:34:13 +0000 |
|---|---|---|
| committer | chriskl | 2005-11-22 01:34:13 +0000 |
| commit | 9ae4b4870a7e518c99a860fd7e1e35a8a767c24e (patch) | |
| tree | 7daddc58decf1b75d3895be28578258b077719e8 | |
| parent | 79791ee07929978ccdde2e4d399970d4cee4a3e4 (diff) | |
Backport: Use pg_clientencoding() if pg_client_encoding() does not exist
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | libraries/lib.inc.php | 9 |
2 files changed, 8 insertions, 2 deletions
@@ -12,6 +12,7 @@ Bugs * Don't prompt to share credentials when only one server is present * Fix logout link * Preserve expanded/collapsed across result pages +* Use pg_clientencoding() if pg_client_encoding() does not exist Version 4.0 ----------- diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php index 0bff3a33..56f6f81a 100644 --- a/libraries/lib.inc.php +++ b/libraries/lib.inc.php @@ -3,7 +3,7 @@ /** * Function library read in upon startup * - * $Id: lib.inc.php,v 1.105.2.1 2005/11/19 09:51:27 chriskl Exp $ + * $Id: lib.inc.php,v 1.105.2.2 2005/11/22 01:34:13 chriskl Exp $ */ include_once('decorator.inc.php'); include_once('./lang/translations.php'); @@ -190,7 +190,12 @@ // Set client encoding to database encoding if ($dbEncoding != '') { // Explicitly change client encoding if it's different to server encoding. - if (pg_client_encoding($data->conn->_connectionID) != $dbEncoding) { + if (function_exists('pg_client_encoding')) + $currEncoding = pg_client_encoding($data->conn->_connectionID); + else + $currEncoding = pg_clientencoding($data->conn->_connectionID); + + if ($currEncoding != $dbEncoding) { $status = $data->setClientEncoding($dbEncoding); if ($status != 0 && $status != -99) { echo $lang['strbadencoding']; |