From: garvinhicking <garvinhicking>
Date: Fri, 9 Jun 2006 20:29:58 +0000 (+0000)
Subject: unforce feedburner
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4b34ff36e5df4de3faa387e7522b9ac8581bdc58;p=s9y.git

unforce feedburner
---

diff --git a/rss.php b/rss.php
index 5152f6d..78ce887 100644
--- a/rss.php
+++ b/rss.php
@@ -149,10 +149,16 @@ if (is_array($plugins)) {
                 }
             }
 
-            if ($_GET['type']  == 'content' && !isset($_GET['category']) && !isset($serendipity['GET']['tag']) && $plugin->get_config('show_feedburner') === 'force' && !preg_match('@FeedBurn@i', $_SERVER['HTTP_USER_AGENT'])) {
-    			$url = 'http://feeds.feedburner.com/' . $plugin->get_config('fb_id');
-    			header('Location: ' . $url);
-    			exit;
+            if ($_GET['type']  == 'content' && 
+                !isset($_GET['category']) && 
+                !isset($serendipity['GET']['tag']) && 
+                $plugin->get_config('show_feedburner') === 'force' && 
+                !preg_match('@FeedBurn@i', $_SERVER['HTTP_USER_AGENT']) &&
+                !(serendipity_userLoggedIn() && isset($_GET['forceLocal']))
+               ) {
+                $url = 'http://feeds.feedburner.com/' . $plugin->get_config('fb_id');
+                header('Location: ' . $url);
+                exit;
             }
             $metadata['showMail']          = serendipity_db_bool($plugin->get_config('show_mail', $metadata['showMail']));
             break;