summaryrefslogtreecommitdiff
path: root/modules/locale.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/locale.module')
-rw-r--r--modules/locale.module6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/locale.module b/modules/locale.module
index 18baa7dd6..2b0230be6 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -189,7 +189,7 @@ function locale_seek() {
foreach ($languages as $key=>$value) {
$tmp[] = $key . (check_query($query->status) == 1 ? " !=" : " =") ." ''";
}
- $sql[] = "(". implode(" || ", $tmp) .")";
+ $sql[] = "(". implode(" OR ", $tmp) .")";
break;
default:
$sql[] = check_query($query->language) . (check_query($query->status) == 1 ? " !=" : " =") ." ''";
@@ -208,10 +208,10 @@ function locale_seek() {
}
}
}
- $sql[] = "(". implode(" || ", $string_query) .")";
+ $sql[] = "(". implode(" OR ", $string_query) .")";
}
- $result = pager_query("SELECT * FROM {locales} ". (count($sql) ? " WHERE ". implode(" && ", $sql) : "") ." ORDER BY string", 50);
+ $result = pager_query("SELECT * FROM {locales} ". (count($sql) ? " WHERE ". implode(" AND ", $sql) : "") ." ORDER BY string", 50);
$header = array(t("string"), (($query->status != 2 && strlen($query->language) == 2) ? t("translated string") : t("languages")), array("data" => t("operations"), "colspan" => "2"));
while ($locale = db_fetch_object($result)) {