@@ -196,15 +196,17 @@ if ($parameter[0] == "(") $post_url_attrs[rtrim(ltrim($parameter, "("), ")")] = $args[$index]; + $original_feed = $this->feed; + if ((oneof(@$post_url_attrs["url"], @$post_url_attrs["clean"]) == "feed") and # do some checking to see if they're trying - (count(explode("/", trim($post_url, "/"))) > count($args) or # to view the post or the post's feed. + (count(explode("/", trim($post_url, "/"))) > count($args) or # to view the post or the post's feed. end($args) != "feed")) $this->feed = false; if ($return_post) return Post::from_url($post_url_attrs); else - $route->try["view"] = array($post_url_attrs); + $route->try["view"] = array($post_url_attrs, $original_feed); } } @@ -371,14 +373,16 @@ * Function: view * Views a post. */ - public function view($attrs = null) { + public function view($attrs = null, $original_feed = false) { if (isset($attrs)) $post = Post::from_url($attrs, array("drafts" => true)); else $post = new Post(array("url" => @$_GET['url'])); - if ($post->no_results) + if ($post->no_results) { + Route::current()->feed = $original_feed; return false; + } if (!$post->theme_exists()) error(__("Error"), __("The feather theme file for this post does not exist. The post cannot be displayed.")); includes/controller/Main.php 2d34862cfd13d2e80e5071cbf182cfb56ac31cae Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/8227e88f9aca7b2a8ae48013cd344baf2c54fdae 8227e88f9aca7b2a8ae48013cd344baf2c54fdae 2008-11-01T16:43:53-07:00 2008-11-01T16:43:53-07:00 When attempting to view a post and the viewing fails, revert the original Route->feed setting. b01e83478faaca5b568d066e32ddd8b4e67ad17e Alex Suraci i.am@toogeneric.com