diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-08-19 08:12:26 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-08-19 08:12:26 +0000 |
| commit | 0ae93f0cb48f320d487deb4518d626a179777b0d (patch) | |
| tree | ce80bf3f6a0410a30e5adce9e6f0541546408db1 /includes | |
| parent | 38abc065344403f7766ab68d523e9a62ceb67bf3 (diff) | |
| download | brdo-0ae93f0cb48f320d487deb4518d626a179777b0d.tar.gz brdo-0ae93f0cb48f320d487deb4518d626a179777b0d.tar.bz2 | |
#542426 by neilnz: PostgreSQL should not require password to be set in settings.php for trust mode.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database/pgsql/database.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc index 0f5627c2a..ec68c3a39 100644 --- a/includes/database/pgsql/database.inc +++ b/includes/database/pgsql/database.inc @@ -26,6 +26,11 @@ class DatabaseConnection_pgsql extends DatabaseConnection { $connection_options['port'] = 5432; } + // PostgreSQL in trust mode doesn't require a password to be supplied. + if (empty($connection_options['password'])) { + $connection_options['password'] = null; + } + $dsn = 'pgsql:host=' . $connection_options['host'] . ' dbname=' . $connection_options['database'] . ' port=' . $connection_options['port']; parent::__construct($dsn, $connection_options['username'], $connection_options['password'], array( // Convert numeric values to strings when fetching. |