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

diff --git a/functions.php b/functions.php
index 72a0606364f0c437a4837dd2a9c79c903defb76e..508a36d4e8de1c22512a261145b0c6fb1c68c9c2 100644 (file)
--- 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\"