7 files changed, 7 insertions, 7 deletions
diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml
index 2541fd323..825c0e6f7 100644
--- a/app/views/admin_request/show.rhtml
+++ b/app/views/admin_request/show.rhtml
@@ -54,7 +54,7 @@
 <% end %>
 
 <p>
-    <%= link_to 'Public page', main_url(request_url(@info_request)) %>
+    <%= link_to 'Public page', main_url(request_path(@info_request)) %>
     | <%= link_to 'Edit', '../edit/' + @info_request.id.to_s %>
     | <%= link_to 'FOI officer upload URL', '../generate_upload_url/' + @info_request.id.to_s %> (see also links on incoming messages below)
 </p>
diff --git a/app/views/api/request_events.atom.builder b/app/views/api/request_events.atom.builder
index 0fe6ac690..3d46e5376 100644
--- a/app/views/api/request_events.atom.builder
+++ b/app/views/api/request_events.atom.builder
@@ -8,7 +8,7 @@ atom_feed("xmlns:alaveteli" => "http://www.alaveteli.org/API/v2/RequestEvents/At
             
             entry.updated(event.created_at.utc.iso8601)
             entry.tag!("alaveteli:event_type", event.event_type)
-            entry.tag!("alaveteli:request_url", main_url(request_url(request)))
+            entry.tag!("alaveteli:request_url", main_url(request_path(request)))
             entry.title(request.title)
             
             entry.content(event.outgoing_message.body, :type => 'text')
diff --git a/app/views/contact_mailer/to_admin_message.rhtml b/app/views/contact_mailer/to_admin_message.rhtml
index 0ef744108..d5aa6ac7c 100644
--- a/app/views/contact_mailer/to_admin_message.rhtml
+++ b/app/views/contact_mailer/to_admin_message.rhtml
@@ -4,7 +4,7 @@
 <%= _('Message sent using {{site_name}} contact form, ', :site_name=>site_name)%>
 <%=(@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)) %>
+<%= _('Last request viewed: ')%><%= main_url(request_path(@last_request)) %>
 <% end %> <% if !@last_body.nil? %>
 
 <%= _('Last authority viewed: ')%><%= main_url(public_body_path(@last_body)) %>
diff --git a/app/views/general/_frontpage_requests_list.rhtml b/app/views/general/_frontpage_requests_list.rhtml
index 63d91d85a..fa498dfa7 100644
--- a/app/views/general/_frontpage_requests_list.rhtml
+++ b/app/views/general/_frontpage_requests_list.rhtml
@@ -21,7 +21,7 @@
 
            <%=link_to h(event.info_request.title), request_path(event.info_request)%>
            <%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(event.described_at)) %>
-           <p class="excerpt" onclick="document.location.href='<%=request_url(event.info_request)%>'"><%= excerpt(event.search_text_main(true), "", 200) %></p>
+           <p class="excerpt" onclick="document.location.href='<%=request_path(event.info_request)%>'"><%= excerpt(event.search_text_main(true), "", 200) %></p>
         </li>
       <% end %>
     </ul>
diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.rhtml
index 3966088af..80a4ce779 100644
--- a/app/views/help/unhappy.rhtml
+++ b/app/views/help/unhappy.rhtml
@@ -62,7 +62,7 @@ to the Scottish Information Commissioner</a>.
 Information Commissioner, either
 <% if !@info_request.nil? %>
     include a link to your request
-    <strong><%=h main_url(request_url(@info_request)) %></strong>
+    <strong><%=h main_url(request_path(@info_request)) %></strong>
 <% else %>
     include a link to your request on <%= site_name %>
 <% end %>
diff --git a/app/views/request/_wall_listing.rhtml b/app/views/request/_wall_listing.rhtml
index 26d34e1a1..e7497f130 100644
--- a/app/views/request/_wall_listing.rhtml
+++ b/app/views/request/_wall_listing.rhtml
@@ -6,7 +6,7 @@ end %>
   <div class="request_left">
       <div class="requester">
         <% if event.event_type == 'sent' %>
-            <%= _('A new request, <em><a href="{{request_url}}">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at),:request_url=>request_url(info_request),:request_title=>info_request.title) %>
+            <%= _('A new request, <em><a href="{{request_url}}">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at),:request_url=>request_path(info_request),:request_title=>info_request.title) %>
         <% elsif event.event_type == 'followup_sent' %>
             <%= _('A <a href="{{request_url}}">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at),:request_url=>outgoing_message_url(event.outgoing_message),:request_title=>info_request.title) %>
         <% elsif event.event_type == 'response' %>
diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml
index 3c9d0057d..19c8ce193 100644
--- a/app/views/request/new.rhtml
+++ b/app/views/request/new.rhtml
@@ -26,7 +26,7 @@
       <li>
        <%= _('{{existing_request_user}} already
       created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>,
-      or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_url(@existing_request)) %> 
+      or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_path(@existing_request)) %> 
       </li>
       </ul></div>
     <% end %>