Merge pull request #836 from AdrianGaudebert/791889-search-decode-fix

Fixes bug 791889 - More robust middleware decode function, and do not do...
mozilla-services · Sep 18, 2012 · e76815d · e76815d
2 parents 7e8e0ae + c195741
commit e76815d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/socorro/middleware/service.py b/socorro/middleware/service.py
@@ -143,6 +143,9 @@ def decode_special_chars(self, value):
             value = value.replace("%2F", "/")
             value = value.replace("%2B", "+")
         except AttributeError:
-            value = [x.replace("%2F", "/") for x in value]
-            value = [x.replace("%2B", "+") for x in value]
+            try:
+                value = [x.replace("%2F", "/") for x in value]
+                value = [x.replace("%2B", "+") for x in value]
+            except TypeError:
+                pass
         return value
diff --git a/webapp-php/application/libraries/MY_SearchReportHelper.php b/webapp-php/application/libraries/MY_SearchReportHelper.php
@@ -44,7 +44,6 @@ public function defaultParams(){
      * @param array An array of $_GET parameters
      */
     public function normalizeParams( &$params ){
-        $params['query'] = urldecode($params['query']);
         $this->normalizeProduct($params);
         $this->normalizeDateUnitAndValue($params);
     }