MDL-31745 blog: Fixed up encoding issue within blog

moodle · Mar 25, 2012 · 038131c · 038131c
1 parent 8925a12
commit 038131c
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/blog/lib.php b/blog/lib.php
@@ -672,7 +672,7 @@ function get_baseurl($filtertype, $filterselect) {
             $querystring = '';
             foreach($_GET as $var => $val) {
                 $var = clean_param($var, PARAM_ALPHANUM);   // See MDL-22631
-                $val = clean_param($val, PARAM_CLEAN);
+                $val = urlencode(clean_param($val, PARAM_CLEAN));
                 if(!$first) {
                     $first = true;
                     if ($var != 'filterselect' && $var != 'filtertype') {
@@ -683,23 +683,22 @@ function get_baseurl($filtertype, $filterselect) {
                     }
                 } else {
                     if ($var != 'filterselect' && $var != 'filtertype') {
-                        $querystring .= '&amp;'.$var.'='.$val;
+                        $querystring .= '&'.$var.'='.$val;
                         $hasparam = true;
                     }
                 }
             }
             if (isset($hasparam)) {
-                $querystring .= '&amp;';
+                $querystring .= '&';
             } else {
                 $querystring = '?';
             }
         } else {
             $querystring = '?';
         }
 
-        return strip_querystring(qualified_me()) . $querystring. 'filtertype='.
-                $filtertype.'&amp;filterselect='.$filterselect.'&amp;';
-
+        return s(strip_querystring(qualified_me()) . $querystring. 'filtertype='.
+                $filtertype.'&filterselect='.$filterselect.'&', true);
     }
 
     /**