X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdb_prefs.php;h=11b73b02e375b6db34e8e4bdce2baf180bc48815;hp=db0b84fd515bb23418566ab0584e0ec75fa4d653;hb=2d92fc32c25e81284f0c40ec8d3c1ee537bb2a6b;hpb=30460a05016c7e066ad7b28df7788539e4054a99

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index db0b84fd..11b73b02 100644
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -21,7 +21,7 @@
  * Configuration of databasename, username and password is done
  * by using conf.pl or the administrator plugin
  *
- * @copyright 1999-2009 The SquirrelMail Project Team
+ * @copyright 1999-2012 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -222,6 +222,14 @@ class dbPrefs {
         if (!empty($prefs_user_field)) {
             $this->user_field = $prefs_user_field;
         }
+
+        // the default user field is "user", which in PostgreSQL
+        // is an identifier and causes errors if not escaped
+        //
+        if ($this->db_type == SMDB_PGSQL) {
+           $this->user_field = '"' . $this->user_field . '"';
+        }
+
         if (!empty($prefs_key_field)) {
             $this->key_field = $prefs_key_field;
         }