diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php --- a/src/applications/phame/application/PhabricatorPhameApplication.php +++ b/src/applications/phame/application/PhabricatorPhameApplication.php @@ -42,7 +42,7 @@ // NOTE: The live routes include an initial "/", so leave it off // this route. - '(?Plive)/(?P[^/]+)' => $this->getLiveRoutes(), + '(?Plive)/(?P\d+)' => $this->getLiveRoutes(), 'post/' => array( '(?:query/(?P[^/]+)/)?' => 'PhamePostListController', 'blogger/(?P[\w\.-_]+)/' => 'PhamePostListController', @@ -61,7 +61,7 @@ '(?:query/(?P[^/]+)/)?' => 'PhameBlogListController', 'archive/(?P[^/]+)/' => 'PhameBlogArchiveController', 'edit/(?P[^/]+)/' => 'PhameBlogEditController', - 'view/(?P[^/]+)/' => 'PhameBlogViewController', + 'view/(?P\d+)/' => 'PhameBlogViewController', 'manage/(?P[^/]+)/' => 'PhameBlogManageController', 'feed/(?P[^/]+)/' => 'PhameBlogFeedController', 'new/' => 'PhameBlogEditController', @@ -92,7 +92,7 @@ return array( '/' => array( '' => 'PhameBlogViewController', - 'post/(?P[^/]+)/(?:(?P[^/]+)/)?' => 'PhamePostViewController', + 'post/(?P\d+)/(?:(?P[^/]+)/)?' => 'PhamePostViewController', ), ); } diff --git a/src/applications/phame/controller/PhameLiveController.php b/src/applications/phame/controller/PhameLiveController.php --- a/src/applications/phame/controller/PhameLiveController.php +++ b/src/applications/phame/controller/PhameLiveController.php @@ -163,21 +163,23 @@ $crumbs->setBorder(true); - if ($post) { - if ($is_live) { - if ($is_external) { - $blog_uri = $blog->getExternalLiveURI(); + if ($blog) { + if ($post) { + if ($is_live) { + if ($is_external) { + $blog_uri = $blog->getExternalLiveURI(); + } else { + $blog_uri = $blog->getInternalLiveURI(); + } } else { - $blog_uri = $blog->getInternalLiveURI(); + $blog_uri = $blog->getViewURI(); } } else { - $blog_uri = $blog->getViewURI(); + $blog_uri = null; } - } else { - $blog_uri = null; - } - $crumbs->addTextCrumb($blog->getName(), $blog_uri); + $crumbs->addTextCrumb($blog->getName(), $blog_uri); + } if ($post) { $crumbs->addTextCrumb($post->getTitle());