aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rwxr-xr-xapp/helpers/link_to_helper.rb3
-rw-r--r--app/views/general/advanced_search.rhtml0
-rw-r--r--app/views/help/_sidebar.rhtml2
3 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index c8ad7bc30..e4e52427b 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -222,8 +222,7 @@ module LinkToHelper
# Admin pages
def admin_url(relative_path)
admin_url_prefix = Configuration::admin_base_url
- admin_url_prefix = admin_general_index_path+"/" if admin_url_prefix.empty?
- return admin_url_prefix + relative_path
+ (admin_url_prefix.empty? ? admin_general_index_url + '/' : admin_url_prefix) + relative_path
end
# About page URLs
diff --git a/app/views/general/advanced_search.rhtml b/app/views/general/advanced_search.rhtml
deleted file mode 100644
index e69de29bb..000000000
--- a/app/views/general/advanced_search.rhtml
+++ /dev/null
diff --git a/app/views/help/_sidebar.rhtml b/app/views/help/_sidebar.rhtml
index 21038e8df..783d35983 100644
--- a/app/views/help/_sidebar.rhtml
+++ b/app/views/help/_sidebar.rhtml
@@ -8,7 +8,7 @@
<li><%= link_to_unless_current "About the software", "/help/alaveteli" %></li>
<li><%= link_to_unless_current "Credits", "/help/credits" %></li>
<li><%= link_to_unless_current "Programmers API", "/help/api" %></li>
- <li><%= link_to_unless_current "Advanced search", "/search" %></li>
+ <li><%= link_to_unless_current "Advanced search", "/advancedsearch" %></li>
</ul>
<h2 id="contact">Contact us</h2>