@@ -196,17 +196,10 @@ 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. - end($args) != "feed")) - $this->feed = false; - if ($return_post) return Post::from_url($post_url_attrs); else - $route->try["view"] = array($post_url_attrs, $original_feed); + $route->try["view"] = array($post_url_attrs, $args); } } @@ -373,16 +366,19 @@ * Function: view * Views a post. */ - public function view($attrs = null, $original_feed = false) { + public function view($attrs = null, $args = array()) { if (isset($attrs)) $post = Post::from_url($attrs, array("drafts" => true)); else $post = new Post(array("url" => @$_GET['url'])); - if ($post->no_results) { - Route::current()->feed = $original_feed; + if ($post->no_results) return false; - } + + if ((oneof(@$attrs["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. + end($args) != "feed")) + $this->feed = false; if (!$post->theme_exists()) error(__("Error"), __("The feather theme file for this post does not exist. The post cannot be displayed.")); @@ -736,3 +732,4 @@ return $instance = (empty($instance)) ? new self() : $instance ; } } + includes/controller/Main.php 8227e88f9aca7b2a8ae48013cd344baf2c54fdae Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/08bfcbbd0492940b546a39dbb67bd8ecd3185c70 08bfcbbd0492940b546a39dbb67bd8ecd3185c70 2008-11-01T17:24:42-07:00 2008-11-01T17:24:42-07:00 Moved the Route->feed changing stuff to the "view" action altogether. f4b8a17bf0286c476c86bc734abdda98f7f69b4e Alex Suraci i.am@toogeneric.com