0
@@ -196,15 +196,17 @@
0
                     if ($parameter[0] == "(")
0
                         $post_url_attrs[rtrim(ltrim($parameter, "("), ")")] = $args[$index];
0
 
0
+                $original_feed = $this->feed;
0
+
0
                 if ((oneof(@$post_url_attrs["url"], @$post_url_attrs["clean"]) == "feed") and # do some checking to see if they're trying
0
-                    (count(explode("/", trim($post_url, "/"))) > count($args) or # to view the post or the post's feed.
0
+                    (count(explode("/", trim($post_url, "/"))) > count($args) or              # to view the post or the post's feed.
0
                      end($args) != "feed"))
0
                     $this->feed = false;
0
 
0
                 if ($return_post)
0
                     return Post::from_url($post_url_attrs);
0
                 else
0
-                    $route->try["view"] = array($post_url_attrs);
0
+                    $route->try["view"] = array($post_url_attrs, $original_feed);
0
             }
0
         }
0
 
0
@@ -371,14 +373,16 @@
0
          * Function: view
0
          * Views a post.
0
          */
0
-        public function view($attrs = null) {
0
+        public function view($attrs = null, $original_feed = false) {
0
             if (isset($attrs))
0
                 $post = Post::from_url($attrs, array("drafts" => true));
0
             else
0
                 $post = new Post(array("url" => @$_GET['url']));
0
 
0
-            if ($post->no_results)
0
+            if ($post->no_results) {
0
+                Route::current()->feed = $original_feed;
0
                 return false;
0
+            }
0
 
0
             if (!$post->theme_exists())
0
                 error(__("Error"), __("The feather theme file for this post does not exist. The post cannot be displayed."));