diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-08-16 17:42:36 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-08-16 17:42:36 +0000 |
| commit | dd7764302f1484face1288d35673e9e9defdfebc (patch) | |
| tree | ef875b37e831f6aa74019311606492f515059fa9 | |
| parent | 3a259e9184afde33d0bb048b87844746793f49e0 (diff) | |
| download | brdo-dd7764302f1484face1288d35673e9e9defdfebc.tar.gz brdo-dd7764302f1484face1288d35673e9e9defdfebc.tar.bz2 | |
- Patch #10111 by Killes: fixed some SQL queries.
| -rw-r--r-- | includes/locale.inc | 4 | ||||
| -rw-r--r-- | modules/locale.module | 2 | ||||
| -rw-r--r-- | modules/locale/locale.module | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index a572bc504..19876577b 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -178,7 +178,7 @@ function _locale_import_po($file, $lang, $mode) { } else { db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, $english[$key]); - $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s'", $comments, $english[$key])); + $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english[$key])); $lid = $lid->lid; } if ($key == 0) { @@ -207,7 +207,7 @@ function _locale_import_po($file, $lang, $mode) { } else { db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, $english); - $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s'", $comments, $english)); + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english)); $lid = $loc->lid; } if ($loc->translation && $mode == 'overwrite') { diff --git a/modules/locale.module b/modules/locale.module index ae6c407bd..b7271481b 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -179,7 +179,7 @@ function locale($string) { else { db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", request_uri(), $string); if ($locale) { - $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s'", request_uri(), $string)); + $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $string)); db_query("INSERT INTO {locales_target} (lid, locale) VALUES (%d, '%s')", $lid->lid, $locale); } } diff --git a/modules/locale/locale.module b/modules/locale/locale.module index ae6c407bd..b7271481b 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -179,7 +179,7 @@ function locale($string) { else { db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", request_uri(), $string); if ($locale) { - $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s'", request_uri(), $string)); + $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $string)); db_query("INSERT INTO {locales_target} (lid, locale) VALUES (%d, '%s')", $lid->lid, $locale); } } |