#82499 by Jose A Reyero and a little bit from myself: send emails localized in the language needed in specific situations, and centralize mail composing operations with hook_mail()

1 files changed, 11 insertions, 3 deletions

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index a2aa44742..e1b28aca7 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1030,9 +1030,17 @@ function language_list($field = 'language', $reset = FALSE) {
 
   // Init language list
   if (!isset($languages)) {
-    $result = db_query('SELECT * FROM {languages} ORDER BY weight ASC, name ASC');
-    while ($row = db_fetch_object($result)) {
-      $languages['language'][$row->language] = $row;
+    if (variable_get('language_count', 1) > 1) {
+      $result = db_query('SELECT * FROM {languages} ORDER BY weight ASC, name ASC');
+      while ($row = db_fetch_object($result)) {
+        $languages['language'][$row->language] = $row;
+      }
+    }
+    else {
+      // One language only, the locale tables might not even
+      // be in place, so use the default language only.
+      $default = language_default();
+      $languages['language'][$default->language] = $default;
     }
   }