# HG changeset patch
# User Anthony Truchet <anthony.truchet@logilab.fr>
# Date 1329908262 -3600
# Node ID 268bc595271b7613fcbd18460e033f5c974e55ee
# Parent  df7d6c57a6c83877130cb2994a445b2e6945ea34# Parent  eff5b930998d11c2fcd2f0a00e1a710556487c36
backporting

diff -r df7d6c57a6c8 -r 268bc595271b .hgignore
--- a/.hgignore	Wed Feb 22 09:31:54 2012 +0100
+++ b/.hgignore	Wed Feb 22 11:57:42 2012 +0100
@@ -14,6 +14,7 @@
 .*/data/database/.*\.sqlite
 .*/data/database/.*\.config
 .*/data/database/tmpdb.*
+.*/data/ldapdb/.*
 ^doc/html/
 ^doc/doctrees/
 ^doc/book/en/devweb/js_api/
diff -r df7d6c57a6c8 -r 268bc595271b web/controller.py
--- a/web/controller.py	Wed Feb 22 09:31:54 2012 +0100
+++ b/web/controller.py	Wed Feb 22 11:57:42 2012 +0100
@@ -207,10 +207,12 @@
         if '__redirectpath' in self._cw.form:
             # if redirect path was explicitly specified in the form, use it
             path = self._cw.form['__redirectpath']
-            url = self._cw.build_url(path, **newparams)
+            url = self._cw.build_url(path)
             url = append_url_params(url, self._cw.form.get('__redirectparams'))
         else:
             url = self._cw.last_visited_page()
+        # The newparams must update the params in all cases
+        url = self._cw.rebuild_url(url, **newparams)
         raise Redirect(url)