archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

404 older-style Phame URIs properly

Browse Source 
Summary: Ref T9968. Some of the crumb/route handling wasn't quite tight enough and could hit a fatal.

Test Plan: Hit previously-fataling URI, got a 404 instead.

Reviewers: chad

Reviewed By: chad

Subscribers: starruler

Maniphest Tasks: T9968

Differential Revision: https://secure.phabricator.com/D14747
This commit is contained in:
epriestley
2015-12-11 17:27:48 -08:00
parent efb6bb3dcf
commit dbdd702702
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/applications/phame/application/PhabricatorPhameApplication.php
View File

@@ -42,7 +42,7 @@ final class PhabricatorPhameApplication extends PhabricatorApplication {
// NOTE: The live routes include an initial "/", so leave it off // NOTE: The live routes include an initial "/", so leave it off
// this route. // this route.
'(?P<live>live)/(?P<blogID>[^/]+)' => $this->getLiveRoutes(), '(?P<live>live)/(?P<blogID>\d+)' => $this->getLiveRoutes(),
'post/' => array( 'post/' => array(
'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhamePostListController', '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhamePostListController',
'blogger/(?P<bloggername>[\w\.-_]+)/' => 'PhamePostListController', 'blogger/(?P<bloggername>[\w\.-_]+)/' => 'PhamePostListController',
@@ -61,7 +61,7 @@ final class PhabricatorPhameApplication extends PhabricatorApplication {
'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhameBlogListController', '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhameBlogListController',
'archive/(?P<id>[^/]+)/' => 'PhameBlogArchiveController', 'archive/(?P<id>[^/]+)/' => 'PhameBlogArchiveController',
'edit/(?P<id>[^/]+)/' => 'PhameBlogEditController', 'edit/(?P<id>[^/]+)/' => 'PhameBlogEditController',
'view/(?P<blogID>[^/]+)/' => 'PhameBlogViewController', 'view/(?P<blogID>\d+)/' => 'PhameBlogViewController',
'manage/(?P<id>[^/]+)/' => 'PhameBlogManageController', 'manage/(?P<id>[^/]+)/' => 'PhameBlogManageController',
'feed/(?P<id>[^/]+)/' => 'PhameBlogFeedController', 'feed/(?P<id>[^/]+)/' => 'PhameBlogFeedController',
'new/' => 'PhameBlogEditController', 'new/' => 'PhameBlogEditController',
@@ -92,7 +92,7 @@ final class PhabricatorPhameApplication extends PhabricatorApplication {
return array( return array(
'/' => array( '/' => array(
'' => 'PhameBlogViewController', '' => 'PhameBlogViewController',
'post/(?P<id>[^/]+)/(?:(?P<slug>[^/]+)/)?' => 'PhamePostViewController', 'post/(?P<id>\d+)/(?:(?P<slug>[^/]+)/)?' => 'PhamePostViewController',
), ),
); );
} }

22
src/applications/phame/controller/PhameLiveController.php
View File

@@ -163,21 +163,23 @@ abstract class PhameLiveController extends PhameController {
$crumbs->setBorder(true); $crumbs->setBorder(true);
if ($post) { if ($blog) {
if ($is_live) { if ($post) {
if ($is_external) { if ($is_live) {
$blog_uri = $blog->getExternalLiveURI(); if ($is_external) {
$blog_uri = $blog->getExternalLiveURI();
} else {
$blog_uri = $blog->getInternalLiveURI();
}
} else { } else {
$blog_uri = $blog->getInternalLiveURI(); $blog_uri = $blog->getViewURI();
} }
} else { } 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) { if ($post) {
$crumbs->addTextCrumb($post->getTitle()); $crumbs->addTextCrumb($post->getTitle());