5 files changed, 6 insertions, 6 deletions
diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml
index 4af79e45a..f6f2a0ae0 100644
--- a/app/views/admin_user/show.rhtml
+++ b/app/views/admin_user/show.rhtml
@@ -34,7 +34,7 @@
 </div>
 
 <p>
-    <%= link_to 'Public page', main_url(user_url(@admin_user)) %>
+    <%= link_to 'Public page', main_url(user_path(@admin_user)) %>
     | <%= link_to 'Edit', '../edit/' + @admin_user.id.to_s %>
     | <%= link_to 'Log in as this user', '../login_as/' + @admin_user.id.to_s %> (also confirms their email)
 </p>
diff --git a/app/views/api/request_events.atom.builder b/app/views/api/request_events.atom.builder
index 44759ae7e..0fe6ac690 100644
--- a/app/views/api/request_events.atom.builder
+++ b/app/views/api/request_events.atom.builder
@@ -16,7 +16,7 @@ atom_feed("xmlns:alaveteli" => "http://www.alaveteli.org/API/v2/RequestEvents/At
             entry.author do |author|
                 author.name(request.user_name)
                 if !request.user.nil?
-                    author.uri(main_url(user_url(request.user)))
+                    author.uri(main_url(user_path(request.user)))
                 end
                 author.email(request.incoming_email)
             end
diff --git a/app/views/contact_mailer/to_admin_message.rhtml b/app/views/contact_mailer/to_admin_message.rhtml
index b41112c61..0ef744108 100644
--- a/app/views/contact_mailer/to_admin_message.rhtml
+++ b/app/views/contact_mailer/to_admin_message.rhtml
@@ -2,7 +2,7 @@
 
 ---------------------------------------------------------------------
 <%= _('Message sent using {{site_name}} contact form, ', :site_name=>site_name)%>
-<%=(@logged_in_user ? ("logged in as user " + main_url(user_url(@logged_in_user))) : "not logged in")%><% if !@last_request.nil? %>
+<%=(@logged_in_user ? ("logged in as user " + main_url(user_path(@logged_in_user))) : "not logged in")%><% if !@last_request.nil? %>
 
 <%= _('Last request viewed: ')%><%= main_url(request_url(@last_request)) %>
 <% end %> <% if !@last_body.nil? %>
diff --git a/app/views/user/_user_listing_single.rhtml b/app/views/user/_user_listing_single.rhtml
index 53df3a7e8..ed1b95718 100644
--- a/app/views/user/_user_listing_single.rhtml
+++ b/app/views/user/_user_listing_single.rhtml
@@ -5,14 +5,14 @@ end %>
 <div class="user_listing">
     <% if display_user.profile_photo %>
         <div class="user_photo_on_search">
-            <a href="<%=user_url(display_user)%>">
+            <a href="<%=user_path(display_user)%>">
             <img src="<%= get_profile_photo_url(:url_name => display_user.url_name) %>" alt="">
             </a>
         </div>
     <% end %>
 
     <span class="head <% if display_user.profile_photo %>no_icon<% end %>">
-        <%= link_to highlight_words(display_user.name, @highlight_words), user_url(display_user) %>
+        <%= link_to highlight_words(display_user.name, @highlight_words), user_path(display_user) %>
     </span>
 
     <span class="bottomline">
diff --git a/app/views/user/set_draft_profile_photo.rhtml b/app/views/user/set_draft_profile_photo.rhtml
index b3faba7fc..757498249 100644
--- a/app/views/user/set_draft_profile_photo.rhtml
+++ b/app/views/user/set_draft_profile_photo.rhtml
@@ -52,7 +52,7 @@
 <% end %>
 
 <p>
-    <%= link_to _("Cancel, return to your profile page"), user_url(@user) %>
+    <%= link_to _("Cancel, return to your profile page"), user_path(@user) %>
 </p>
 
 </div>