[MERGE] upstream

bzr revid: fme@openerp.com-20140225104654-d1ni7z5t8w0qc7mw

1 files changed, 1 insertions, 1 deletions

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 252afc36b30..5a22240abac 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -25,7 +25,7 @@ def fragment_to_query_string(func):
             return """<html><head><script>
                 var l = window.location;
                 var q = l.hash.substring(1);
-                var r = '/' + l.search;
+                var r = l.pathname + l.search;
                 if(q.length !== 0) {
                     var s = l.search ? (l.search === '?' ? '' : '&') : '?';
                     r = l.pathname + l.search + s + q;