merge from HEAD

Author: Richard Jones

roundup/cgi/templating.py

@@ -2028,15 +2028,16 @@ def indexargs_url(self, url, args):
 
         # finally, the remainder of the filter args in the request
         props = self.client.db.getclass(self.classname).getprops()
+        q = urllib.quote
         for k,v in self.filterspec.items():
             if not args.has_key(k):
                 if type(v) == type([]):
                     if isinstance(props[k], hyperdb.String):
-                        l.append(s%(k, ' '.join(v)))
+                        l.append('%s=%s'%(k, '%20'.join([q(i) for i in v])))
                     else:
-                        l.append(s%(k, ','.join(v)))
+                        l.append('%s=%s'%(k, ','.join([q(i) for i in v])))
                 else:
-                    l.append('%s=%s'%(k, v))
+                    l.append('%s=%s'%(k, q(v)))
         return '%s?%s'%(url, '&'.join(l))
     indexargs_href = indexargs_url