Page MenuHomePhabricator
Files F14023475

D14747.diff
No OneTemporary
Actions

D14747.diff
View Options

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.
- '(?P<live>live)/(?P<blogID>[^/]+)' => $this->getLiveRoutes(),
+ '(?P<live>live)/(?P<blogID>\d+)' => $this->getLiveRoutes(),
'post/' => array(
'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhamePostListController',
'blogger/(?P<bloggername>[\w\.-_]+)/' => 'PhamePostListController',
@@ -61,7 +61,7 @@
'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhameBlogListController',
'archive/(?P<id>[^/]+)/' => 'PhameBlogArchiveController',
'edit/(?P<id>[^/]+)/' => 'PhameBlogEditController',
- 'view/(?P<blogID>[^/]+)/' => 'PhameBlogViewController',
+ 'view/(?P<blogID>\d+)/' => 'PhameBlogViewController',
'manage/(?P<id>[^/]+)/' => 'PhameBlogManageController',
'feed/(?P<id>[^/]+)/' => 'PhameBlogFeedController',
'new/' => 'PhameBlogEditController',
@@ -92,7 +92,7 @@
return array(
'/' => array(
'' => 'PhameBlogViewController',
- 'post/(?P<id>[^/]+)/(?:(?P<slug>[^/]+)/)?' => 'PhamePostViewController',
+ 'post/(?P<id>\d+)/(?:(?P<slug>[^/]+)/)?' => '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());

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 8, 2:13 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6743477
Default Alt Text
D14747.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility