From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 8 Nov 2010 11:37:19 +0000 (+0300)
Subject: subtoolbar: remove adaptive/all_articles view modes from generated feed urls by default
X-Git-Tag: 1.5.0~357
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=aa1c2aa4f9eecdad2da212c731573b4aa1604dd0;p=tt-rss.git

subtoolbar: remove adaptive/all_articles view modes from generated feed urls by default
---

diff --git a/functions.php b/functions.php
index 72a06063..508a36d4 100644
--- a/functions.php
+++ b/functions.php
@@ -4203,8 +4203,15 @@
 				$search_q = "";
 			}
 
+			// Adaptive doesn't really make any sense for generated feeds
+			// All Articles is the default, so no need to insert it either
+			if ($view_mode == "adaptive" || $view_mode == "all_articles") 
+				$view_mode = "";
+			else
+				$view_mode = "&view-mode=$view_mode";
+
 			$rss_link = htmlspecialchars(get_self_url_prefix() . 
-				"/backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view-mode=$view_mode$search_q");
+				"/backend.php?op=rss&id=$feed_id&is_cat=$is_cat$view_mode$search_q");
 
 			#print "
 			#	<a target=\"_blank\"