Merge branch 'feature/php8' of wn/tt-rss into master

4 files changed, 18 insertions, 21 deletions

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 8c54a2a92..fb9925956 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -126,6 +126,7 @@ class Pref_Feeds extends Handler_Protected {
 		$root['id'] = 'root';
 		$root['name'] = __('Feeds');
 		$root['items'] = array();
+		$root['param'] = 0;
 		$root['type'] = 'category';
 
 		$enable_cats = get_pref('ENABLE_FEED_CATS');
@@ -229,7 +230,7 @@ class Pref_Feeds extends Handler_Protected {
 				$cat['items'] = $this->get_category_items($line['id']);
 
 				$num_children = $this->calculate_children_count($cat);
-				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+				$cat['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
 				if ($num_children > 0 || $show_empty_cats)
 					array_push($root['items'], $cat);
@@ -277,13 +278,13 @@ class Pref_Feeds extends Handler_Protected {
 				array_push($cat['items'], $feed);
 			}
 
-			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
+			$cat['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
 
 			if (count($cat['items']) > 0 || $show_empty_cats)
 				array_push($root['items'], $cat);
 
 			$num_children = $this->calculate_children_count($root);
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+			$root['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
 		} else {
 			$fsth = $this->pdo->prepare("SELECT id, title, last_error,
@@ -312,7 +313,7 @@ class Pref_Feeds extends Handler_Protected {
 				array_push($root['items'], $feed);
 			}
 
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
+			$root['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
 		}
 
 		$fl = array();
@@ -1208,10 +1209,11 @@ class Pref_Feeds extends Handler_Protected {
 		}
 
 		if ($num_errors > 0) {
-
 			$error_button = "<button dojoType=\"dijit.form.Button\"
 			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
 				__("Feeds with errors") . "</button>";
+		} else {
+			$error_button = "";
 		}
 
 		$inactive_button = "<button dojoType=\"dijit.form.Button\"
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 00644c59f..70b7d0326 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -736,10 +736,8 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	function index() {
-
-		$filter_search = clean($_REQUEST["search"]);
-
 		if (array_key_exists("search", $_REQUEST)) {
+			$filter_search = clean($_REQUEST["search"]);
 			$_SESSION["prefs_filter_search"] = $filter_search;
 		} else {
 			$filter_search = $_SESSION["prefs_filter_search"];
@@ -749,12 +747,6 @@ class Pref_Filters extends Handler_Protected {
 		print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
 		print "<div dojoType='fox.Toolbar'>";
 
-		if (array_key_exists("search", $_REQUEST)) {
-			$_SESSION["prefs_filter_search"] = $filter_search;
-		} else {
-			$filter_search = $_SESSION["prefs_filter_search"];
-		}
-
 		print "<div style='float : right; padding-right : 4px;'>
 			<input dojoType=\"dijit.form.TextBox\" id=\"filter_search\" size=\"20\" type=\"search\"
 				value=\"$filter_search\">
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index d7b486cbb..4e57ea846 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1271,14 +1271,14 @@ class Pref_Prefs extends Handler_Protected {
 	}
 
 	private function getShortDesc($pref_name) {
-		if (isset($this->pref_help[$pref_name])) {
+		if (isset($this->pref_help[$pref_name][0])) {
 			return $this->pref_help[$pref_name][0];
 		}
 		return "";
 	}
 
 	private function getHelpText($pref_name) {
-		if (isset($this->pref_help[$pref_name])) {
+		if (isset($this->pref_help[$pref_name][1])) {
 			return $this->pref_help[$pref_name][1];
 		}
 		return "";
diff --git a/classes/urlhelper.php b/classes/urlhelper.php
index cc1074c55..fec36de51 100644
--- a/classes/urlhelper.php
+++ b/classes/urlhelper.php
@@ -1,8 +1,9 @@
 <?php
 class UrlHelper {
 	static function build_url($parts) {
-		$tmp = $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
+		$tmp = $parts['scheme'] . "://" . $parts['host'];
 
+		if (isset($parts['path'])) $tmp .= $parts['path'];
 		if (isset($parts['query'])) $tmp .= '?' . $parts['query'];
 		if (isset($parts['fragment'])) $tmp .= '#' . $parts['fragment'];
 
@@ -35,11 +36,13 @@ class UrlHelper {
 			$rel_parts['host'] = $parts['host'];
 			$rel_parts['scheme'] = $parts['scheme'];
 
-			if (strpos($rel_parts['path'], '/') !== 0)
-				$rel_parts['path'] = '/' . $rel_parts['path'];
+			if (isset($rel_parts['path'])) {
+				if (strpos($rel_parts['path'], '/') !== 0)
+					$rel_parts['path'] = '/' . $rel_parts['path'];
 
-			$rel_parts['path'] = str_replace("/./", "/", $rel_parts['path']);
-			$rel_parts['path'] = str_replace("//", "/", $rel_parts['path']);
+				$rel_parts['path'] = str_replace("/./", "/", $rel_parts['path']);
+				$rel_parts['path'] = str_replace("//", "/", $rel_parts['path']);
+			}
 
 			return self::validate(self::build_url($rel_parts));
 		}