From c93bcff8b85a24fe200fe27bd4c8f860f7d01b9c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 17 Feb 2001 16:26:48 +0000
Subject: [PATCH] *** empty log message ***
---
modules/locale.module | 8 +++++---
modules/locale/locale.module | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/modules/locale.module b/modules/locale.module
index 8a1c3e1ac4a4..43fd0658707e 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -83,9 +83,11 @@ function locale_admin() {
function locale($string) {
global $locale;
- $result = db_query("SELECT id, $locale FROM locales WHERE STRCMP(string, '". addslashes($string) ."') = 0");
- if ($translation = db_fetch_object($result)) $string = ($translation->$locale) ? check_output($translation->$locale) : $string;
- else db_query("INSERT INTO locales (string, location) VALUES ('". addslashes($string) ."', '". check_input(getenv("REQUEST_URI")) ."')");
+ if ($locale) {
+ $result = db_query("SELECT id, $locale FROM locales WHERE STRCMP(string, '". addslashes($string) ."') = 0");
+ if ($translation = db_fetch_object($result)) $string = ($translation->$locale) ? check_output($translation->$locale) : $string;
+ else db_query("INSERT INTO locales (string, location) VALUES ('". addslashes($string) ."', '". check_input(getenv("REQUEST_URI")) ."')");
+ }
return $string;
}
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 8a1c3e1ac4a4..43fd0658707e 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -83,9 +83,11 @@ function locale_admin() {
function locale($string) {
global $locale;
- $result = db_query("SELECT id, $locale FROM locales WHERE STRCMP(string, '". addslashes($string) ."') = 0");
- if ($translation = db_fetch_object($result)) $string = ($translation->$locale) ? check_output($translation->$locale) : $string;
- else db_query("INSERT INTO locales (string, location) VALUES ('". addslashes($string) ."', '". check_input(getenv("REQUEST_URI")) ."')");
+ if ($locale) {
+ $result = db_query("SELECT id, $locale FROM locales WHERE STRCMP(string, '". addslashes($string) ."') = 0");
+ if ($translation = db_fetch_object($result)) $string = ($translation->$locale) ? check_output($translation->$locale) : $string;
+ else db_query("INSERT INTO locales (string, location) VALUES ('". addslashes($string) ."', '". check_input(getenv("REQUEST_URI")) ."')");
+ }
return $string;
}
--
GitLab