fixes #2417

app/views/posts/partials/common/_secondary_links.html.erb

@@ -7,13 +7,13 @@
     <% unless CurrentUser.is_anonymous? %>
       <li><%= link_to "Favorites", favorites_path %></li>
       <li><%= link_to "Favorite groups", favorite_groups_path %></li>
-      <% if CurrentUser.user.has_saved_searches? %>
+      <% if CurrentUser.has_saved_searches? %>
         <li><%= link_to "Saved searches", saved_searches_path %></li>
       <% end %>
       <li><%= link_to "Subscriptions", posts_path(:tags => "sub:#{CurrentUser.name}") %></li>
     <% end %>
     <li class="nonessential"><%= link_to "Changes", post_versions_path %></li>
-    <% if CurrentUser.is_janitor? %>
+    <% if CurrentUser.can_approve_posts? %>
       <li class="nonessential"><%= link_to "Moderate", moderator_post_queue_path %></li>
     <% end %>
     <li class="nonessential"><%= link_to "Help", wiki_pages_path(:title => "help:posts") %></li>

app/views/posts/partials/index/_mode_menu.html.erb

@@ -17,7 +17,7 @@
           <option value="lock-rating">Lock rating</option>
           <option value="lock-note">Lock notes</option>
         <% end %>
-        <% if CurrentUser.is_janitor? %>
+        <% if CurrentUser.can_approve_posts? %>
           <option value="approve">Approve</option>
         <% end %>
       </select>

app/views/posts/partials/show/_notices.html.erb

@@ -27,7 +27,7 @@
   <div class="ui-corner-all ui-state-highlight notice notice-pending" id="pending-approval-notice">
     This post is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "about:mod_queue") %>)
 
-    <% if CurrentUser.is_janitor? && !post.disapproved_by?(CurrentUser.user) %>
+    <% if CurrentUser.can_approve_posts? && !post.disapproved_by?(CurrentUser.user) %>
       <div class="quick-mod">
         <% unless post.is_status_locked? %>
           <%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :method => :post, :remote => true, :class => "btn" %> |

app/views/posts/partials/show/_options.html.erb

@@ -28,7 +28,7 @@
       <li><%= link_to "Appeal", new_post_appeal_path(:post_id => post.id), :id => "appeal" %></li>
     <% end %>
 
-    <% if CurrentUser.is_janitor? %>
+    <% if CurrentUser.can_approve_posts? %>
       <% if post.is_deleted? %>
         <li><%= link_to "Undelete", undelete_moderator_post_post_path(:post_id => post.id), :remote => true, :method => :post, :id => "undelete" %></li>
       <% else %>