From f8836ec08065f8c9c0d67611aaa0705bfc9edf96 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 20 Feb 2019 15:12:37 +0300 Subject: [PATCH] search dialog fixes pgsql: get FTS languages list from the database --- classes/feeds.php | 11 +++++++---- classes/pref/feeds.php | 23 ++++++++++++++++++----- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 058ac0215..ba04e84b3 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -785,16 +785,19 @@ class Feeds extends Handler_Protected { print "
"; + print "
"; print ""; + print "".T_sprintf('in %s', $this->getFeedTitle($active_feed_id, $is_cat)).""; + print "
"; - print "
".T_sprintf('in %s', $this->getFeedTitle($active_feed_id, $is_cat)).""; if (DB_TYPE == "pgsql") { - print "
"; - print_select("search_language", "", Pref_Feeds::$feed_languages, + print "
"; + print_select("search_language", "", Pref_Feeds::get_ts_languages(), "dojoType='dijit.form.Select' title=\"".__('Used for word stemming')."\""); + print "
"; } print "
"; diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 042905c6f..12f7d9f71 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1,8 +1,5 @@ query("SELECT cfgname FROM pg_ts_config"); + + while ($row = $res->fetch()) { + array_push($rv, ucfirst($row['cfgname'])); + } + } + + return $rv; + } + function batch_edit_cbox($elem, $label = false) { print ""; @@ -590,7 +603,7 @@ class Pref_Feeds extends Handler_Protected { print "
"; print " "; - print_select("feed_language", $feed_language, $this::$feed_languages, + print_select("feed_language", $feed_language, $this::get_ts_languages(), 'dojoType="dijit.form.Select"'); print "
"; @@ -859,7 +872,7 @@ class Pref_Feeds extends Handler_Protected { print "
"; print " "; - print_select("feed_language", "", $this::$feed_languages, + print_select("feed_language", "", $this::get_ts_languages(), 'disabled="1" dojoType="dijit.form.Select"'); $this->batch_edit_cbox("feed_language");