Backport: Use pg_clientencoding() if pg_client_encoding() does not exist

diff --git a/HISTORY b/HISTORY
index 4a110e54165eba2d12930586e25f51c2dc282a42..b0d1eec24b4b28b5c14b4e9cf5c25c6b3dc9309e 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -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 0bff3a336533e2a5c59190e57899df1ea9c59d88..56f6f81a5cd68d54cab011b99bc46fac61f74062 100644 (file)
--- 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'];