diff options
| author | chriskl | 2005-11-23 04:31:10 +0000 |
|---|---|---|
| committer | chriskl | 2005-11-23 04:31:10 +0000 |
| commit | 875245a95246f816dc6d9043c17138db158edcdb (patch) | |
| tree | a93fffccf390bde4b2510451adb5936928271b7c | |
| parent | 9ae4b4870a7e518c99a860fd7e1e35a8a767c24e (diff) | |
backport: Apparently some people don't even have pg_clientencodingREL_4-0-1
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | libraries/lib.inc.php | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -12,7 +12,8 @@ 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 +* Use pg_clientencoding() if pg_client_encoding() does not exist. If + pg_clientencoding() itself doesn't exist, then force setting the encoding Version 4.0 ----------- diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php index 56f6f81a..06c9ac58 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.2 2005/11/22 01:34:13 chriskl Exp $ + * $Id: lib.inc.php,v 1.105.2.3 2005/11/23 04:31:10 chriskl Exp $ */ include_once('decorator.inc.php'); include_once('./lang/translations.php'); @@ -192,8 +192,10 @@ // Explicitly change client encoding if it's different to server encoding. if (function_exists('pg_client_encoding')) $currEncoding = pg_client_encoding($data->conn->_connectionID); - else + elseif (function_exists('pg_clientencoding')) $currEncoding = pg_clientencoding($data->conn->_connectionID); + else + $currEncoding = null; if ($currEncoding != $dbEncoding) { $status = $data->setClientEncoding($dbEncoding); |