diff --git a/externals/skins/oblivious/header.php b/externals/skins/oblivious/header.php index c3e7a4d60f..0ea9f331c7 100644 --- a/externals/skins/oblivious/header.php +++ b/externals/skins/oblivious/header.php @@ -13,6 +13,6 @@ echo _e($blog->getName()); ?> -

getDescription()); ?>

+

remarkup($blog->getDescription()); ?>

diff --git a/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php b/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php index ba5c479f27..f473eedd49 100644 --- a/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php +++ b/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php @@ -79,6 +79,12 @@ final class PhameBasicTemplateBlogSkin extends PhameBasicBlogSkin { return $this->cssResources; } + public function remarkup($corpus) { + $view = id(new PHUIRemarkupView($this->getViewer(), $corpus)); + + return hsprintf('%s', $view); + } + public function getName() { return $this->getSpecification()->getName(); } @@ -107,13 +113,16 @@ final class PhameBasicTemplateBlogSkin extends PhameBasicBlogSkin { private function getDefaultScope() { return array( - 'skin' => $this, - 'blog' => $this->getBlog(), - 'uri' => $this->getURI($this->getURIPath()), - 'home_uri' => $this->getURI(''), - 'title' => $this->getTitle(), + 'skin' => $this, + 'blog' => $this->getBlog(), + 'uri' => $this->getURI($this->getURIPath()), + 'home_uri' => $this->getURI(''), + + // TODO: This is wrong for detail pages, which should show the post + // title, but getting it right is a pain and this is better than nothing. + 'title' => $this->getBlog()->getName(), 'description' => $this->getDescription(), - 'og_type' => $this->getOGType(), + 'og_type' => $this->getOGType(), ); } @@ -135,7 +144,7 @@ final class PhameBasicTemplateBlogSkin extends PhameBasicBlogSkin { return $this->renderTemplate( 'post-detail.php', array( - 'post' => $post, + 'post' => $post, )); }