[#2375] Cleanup of CKAN_CURRENT_URL as issue also affects legacy temp…

…lates
ckan · Aug 10, 2012 · 0e7fd02 · 0e7fd02
1 parent c531c69
commit 0e7fd02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py
@@ -201,14 +201,12 @@ def __call__(self, environ, start_response):
             path_info = '/'.join(urllib.quote(pce,'') for pce in path_info.split('/'))
 
             qs = environ.get('QUERY_STRING')
-            # sort out weird encodings
 
             if qs:
-                environ['CKAN_CURRENT_URL_RAW'] = '%s?%s' % (path_info, qs)
-                qs = urllib.quote(qs, '')
+                # sort out weird encodings
+                #qs = urllib.quote(qs, '')
                 environ['CKAN_CURRENT_URL'] = '%s?%s' % (path_info, qs)
             else:
-                environ['CKAN_CURRENT_URL_RAW'] = path_info
                 environ['CKAN_CURRENT_URL'] = path_info
 
         return self.app(environ, start_response)

diff --git a/ckan/templates/snippets/language_selector.html b/ckan/templates/snippets/language_selector.html
@@ -1,4 +1,4 @@
-{% set current_url = request.environ.CKAN_CURRENT_URL_RAW %}
+{% set current_url = request.environ.CKAN_CURRENT_URL %}
 {% set current_lang = request.environ.CKAN_LANG %}
 <form class="form-inline form-select lang-select" action="{% url_for controller='util', action='redirect' %}" data-module="select-switch" method="POST">
   <label for="field-lang-select">{{ _('Language') }}</label>