--- feedburner.module.original	2008-10-29 18:14:28.000000000 -0400
+++ feedburner.module	2008-10-29 18:14:28.000000000 -0400
@@ -129,7 +129,6 @@
  */
 function feedburner_init() {
   _feedburner_redirect();
-
   // Emulate Drupal 6's menu-file-include system and include the admin functions on the FeedBurner admin paths
   if (isset($_GET['q']) && preg_match('/admin\/.*feedburner.*/i', $_GET['q'])) {
     _feedburner_include('admin');
@@ -286,11 +285,10 @@
  * url is associated with a feed.
  */
 function _feedburner_redirect() {
-  // Ensure we have path functions loaded to use $_GET['q'].
+ // Ensure we have path functions loaded to use $_GET['q'].
   if (!isset($_GET['q'])) {
     drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH);
   }
-
   // Drupal paths with plus signs get turned into spaces in $_GET['q']. In
   // order to match them to the urls in the database, translate the spaces
   // back into plus signs.
@@ -300,7 +298,6 @@
   if (preg_match('/^admin\//i', $path)) {
     return;
   }
-
   // If the current user's useragent matches any of the useragent strings allowed raw feed access, stop redirecting.
   $useragents = '/'. _feedburner_var('useragents') .'/i';
   if (!preg_match($useragents, $_SERVER['HTTP_USER_AGENT'])) {
@@ -308,10 +305,10 @@
     // Ensure the function drupal_goto exists without having to call
     // drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL). Only want to have minimal
     // amount of Drupal loaded. Sorry for the shortcut.
-    if (!function_exists('drupal_goto')) {
-      include_once './includes/common.inc';
-    }
-
+    // Commented the next 3 lines out since it seems to cause a comflict with og.module and page caching 
+      //    if (!function_exists('drupal_goto')) {
+      //      include_once './includes/common.inc';
+      //    }
     // If there is a FeedBurner feed matched to the current system url and if
     // the disabled redirection override query string ('feedburner_redirect=false')
     // isn't present, perform the redirect to the FeedBurner feed.
@@ -320,7 +317,12 @@
     if (isset($feed->fb_uri) && !$skip_redirect) {
       $url = _feedburner_construct_url($feed->fb_uri);
       $status = _feedburner_var('redirect_status');
-      drupal_goto($url, null, null, $status);
+      // The next five lines are replacing just the drupal_goto  
+        if (!function_exists('drupal_goto')) { 
+          header("Location: $url");
+        } else {
+          drupal_goto($url, null, null, $status);
+        }
     }
   }
   else {