Skip to content
Snippets Groups Projects
Commit 92d0f3e6 authored by Dries Buytaert's avatar Dries Buytaert
Browse files

- Patch #82137 by havran: make installer work with PostgreSQL.

parent d5af416e
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* Report database status. * Report database status.
*/ */
function db_status_report() { function db_status_report() {
$t = get_t().dli; $t = get_t();
$form['pgsql'] = array(); $form['pgsql'] = array();
...@@ -27,7 +27,7 @@ function db_status_report() { ...@@ -27,7 +27,7 @@ function db_status_report() {
} }
} }
else { else {
$version = array('server' => t('Unknown')); $version = array('server' => $t('Unknown'));
} }
$form['pgsql']['title'] = $t('PostgreSQL database'); $form['pgsql']['title'] = $t('PostgreSQL database');
...@@ -390,7 +390,7 @@ function db_table_exists($table) { ...@@ -390,7 +390,7 @@ function db_table_exists($table) {
function db_check_setup() { function db_check_setup() {
$encoding = db_result(db_query('SHOW server_encoding')); $encoding = db_result(db_query('SHOW server_encoding'));
if (!in_array(strtolower($encoding), array('unicode', 'utf8'))) { if (!in_array(strtolower($encoding), array('unicode', 'utf8'))) {
drupal_set_message(t('Your PostgreSQL database is set up with the wrong character encoding (%encoding). It is possible it will not work as expected. It is advised to recreate it with UTF-8/Unicode encoding. More information can be found in the <a href="@url">PostgreSQL documentation</a>.', array('%encoding' => $encoding, '@url' => 'http://www.postgresql.org/docs/7.4/interactive/multibyte.html')), 'status'); drupal_set_message($t('Your PostgreSQL database is set up with the wrong character encoding (%encoding). It is possible it will not work as expected. It is advised to recreate it with UTF-8/Unicode encoding. More information can be found in the <a href="@url">PostgreSQL documentation</a>.', array('%encoding' => $encoding, '@url' => 'http://www.postgresql.org/docs/7.4/interactive/multibyte.html')), 'status');
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment