Merge branch 'master' into phutil_tag

Auditors: vrana
2013-02-13 12:42:57 -08:00
parent 4eb84149c2 2dab1c1e42
commit 4bd2ad9270
49 changed files with 855 additions and 241 deletions
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -249,7 +249,7 @@ final class PhrictionEditController
        'uri'       => '/phriction/preview/?draftkey='.$draft_key,
      ));

-    return $this->buildStandardPageResponse(
+    return $this->buildApplicationPage(
      array(
        $draft_note,
        $error_view,
@@ -258,6 +258,7 @@ final class PhrictionEditController
      ),
      array(
        'title' => pht('Edit Document'),
+        'device' => true,
      ));
  }