From efc70a2bca72032fc9b198e26431a49daceb0585 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 12 Jun 2014 11:20:44 -0400
Subject: [PATCH] Always show Bookmark icon. Always show edit if the post is a
 wiki.

---
 app/assets/javascripts/discourse/views/post-menu.js.es6 | 9 +++++++--
 config/site_settings.yml                                | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/views/post-menu.js.es6 b/app/assets/javascripts/discourse/views/post-menu.js.es6
index c7353573aa..794dffc2d9 100644
--- a/app/assets/javascripts/discourse/views/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/views/post-menu.js.es6
@@ -109,7 +109,9 @@ export default Discourse.View.extend({
         var button = creator.call(self, post);
         if (button) {
           allButtons.push(button);
-          if ((yours && button.opts.alwaysShowYours) || (hiddenButtons.indexOf(i) === -1)) {
+          if ((yours && button.opts.alwaysShowYours) ||
+              (post.get('wiki') && button.opts.alwaysShowWiki) ||
+              (hiddenButtons.indexOf(i) === -1)) {
             visibleButtons.push(button);
           }
         }
@@ -202,7 +204,10 @@ export default Discourse.View.extend({
   // Edit button
   buttonForEdit: function(post) {
     if (!post.get('can_edit')) return;
-    return new Button('edit', 'post.controls.edit', 'pencil', {alwaysShowYours: true});
+    return new Button('edit', 'post.controls.edit', 'pencil', {
+      alwaysShowYours: true,
+      alwaysShowWiki: true
+    });
   },
 
   clickEdit: function(post) {
diff --git a/config/site_settings.yml b/config/site_settings.yml
index addcc309d7..c0bd8fa397 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -89,7 +89,7 @@ basic:
   post_menu_hidden_items:
     client: true
     list: true
-    default: 'edit|bookmark|delete|admin'
+    default: 'edit|delete|admin'
     choices:
      - like
      - edit