projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix sqauth_read_password() for plugins running on the login_verified hook when the...
[squirrelmail.git]
/
functions
/
db_prefs.php
diff --git
a/functions/db_prefs.php
b/functions/db_prefs.php
index 87990fddb2a7068c9f8b0860f7cffbb1b5235196..fc64be502e565a0a52cd5d28e8e52ba8d3d3e920 100644
(file)
--- 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
*
* 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-2010
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @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;
}
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;
}
if (!empty($prefs_key_field)) {
$this->key_field = $prefs_key_field;
}