summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-09-25 10:03:42 +0300
committerAndrew Dolgov <[email protected]>2020-09-25 10:03:42 +0300
commit71e9f70b8a5fa128204eb4a47c06639206824500 (patch)
treee5fd7fb65c1f80d2285070167c296d182ee18914 /classes
parent05744bb474e55c4f85acd236dd2883679c278e70 (diff)
search_to_sql: use per-user default language instead of hardcoded english if isn't specified explicitly
Diffstat (limited to 'classes')
-rwxr-xr-xclasses/feeds.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index bb5456577..f6e86f143 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -851,7 +851,7 @@ class Feeds extends Handler_Protected {
// fall back in case of no plugins
if (!$search_qpart) {
- list($search_qpart, $search_words) = self::search_to_sql($search[0], $search[1]);
+ list($search_qpart, $search_words) = self::search_to_sql($search[0], $search[1], $owner_uid);
}
} else {
$search_qpart = "true";
@@ -1450,7 +1450,7 @@ class Feeds extends Handler_Protected {
// fall back in case of no plugins
if (!$search_query_part) {
- list($search_query_part, $search_words) = self::search_to_sql($search, $search_language);
+ list($search_query_part, $search_words) = self::search_to_sql($search, $search_language, $owner_uid);
}
if (DB_TYPE == "pgsql") {
@@ -2117,7 +2117,7 @@ class Feeds extends Handler_Protected {
}
}
- static function search_to_sql($search, $search_language) {
+ static function search_to_sql($search, $search_language, $owner_uid) {
$keywords = str_getcsv(trim($search), " ");
$query_keywords = array();
@@ -2129,7 +2129,7 @@ class Feeds extends Handler_Protected {
if ($search_language)
$search_language = $pdo->quote(mb_strtolower($search_language));
else
- $search_language = $pdo->quote("english");
+ $search_language = $pdo->quote(mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid)));
foreach ($keywords as $k) {
if (strpos($k, "-") === 0) {