# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1466487875 -7200
# Node ID 4482e94daabefe0308b02fa954f3f8e06e27d3a7
# Parent  3e69bccc202287f208126ab5e401887df3838fc6# Parent  2cc16363d6a354f96f068275dbe9195a1f283cf0
backport 3.21 changes

diff -r 3e69bccc2022 -r 4482e94daabe .hgtags
--- a/.hgtags	Thu Jun 16 17:45:16 2016 +0200
+++ b/.hgtags	Tue Jun 21 07:44:35 2016 +0200
@@ -551,3 +551,6 @@
 1b93ff37755b0588081f6fcb93da0dde772a6adb 3.22.2
 1b93ff37755b0588081f6fcb93da0dde772a6adb debian/3.22.2-1
 1b93ff37755b0588081f6fcb93da0dde772a6adb centos/3.22.2-1
+636a83e65870433c2560f3c49d55ca628bc96e11 3.20.15
+636a83e65870433c2560f3c49d55ca628bc96e11 debian/3.20.15-1
+636a83e65870433c2560f3c49d55ca628bc96e11 centos/3.20.15-1
diff -r 3e69bccc2022 -r 4482e94daabe __pkginfo__.py
diff -r 3e69bccc2022 -r 4482e94daabe cubicweb.spec
diff -r 3e69bccc2022 -r 4482e94daabe debian/changelog
--- a/debian/changelog	Thu Jun 16 17:45:16 2016 +0200
+++ b/debian/changelog	Tue Jun 21 07:44:35 2016 +0200
@@ -64,6 +64,12 @@
 
  -- Julien Cristau <julien.cristau@logilab.fr>  Fri, 10 Jul 2015 17:04:11 +0200
 
+cubicweb (3.20.15-1) unstable; urgency=medium
+
+  * new upstream release 
+
+ -- David Douard <david.douard@logilab.fr>  Mon, 09 May 2016 17:04:10 +0200
+
 cubicweb (3.20.14-1) unstable; urgency=medium
 
   * new upstream release
diff -r 3e69bccc2022 -r 4482e94daabe server/session.py
--- a/server/session.py	Thu Jun 16 17:45:16 2016 +0200
+++ b/server/session.py	Tue Jun 21 07:44:35 2016 +0200
@@ -1123,7 +1123,7 @@
     # CWUser compat for notification ###########################################
 
     def name(self):
-        return 'cubicweb'
+        return ''
 
     class _IEmailable:
         @staticmethod
diff -r 3e69bccc2022 -r 4482e94daabe web/views/basetemplates.py
--- a/web/views/basetemplates.py	Thu Jun 16 17:45:16 2016 +0200
+++ b/web/views/basetemplates.py	Tue Jun 21 07:44:35 2016 +0200
@@ -508,8 +508,10 @@
                 stitle = u'&#160;'
             w(u'<div class="loginTitle">%s</div>' % stitle)
         w(u'<div class="loginContent">\n')
-        if showmessage and self._cw.message:
-            w(u'<div class="loginMessage">%s</div>\n' % self._cw.message)
+        # don't call self._cw.message twice since it pops the id
+        msg = self._cw.message
+        if showmessage and msg:
+            w(u'<div class="loginMessage">%s</div>\n' % msg)
         config = self._cw.vreg.config
         if config['auth-mode'] != 'http':
             self.login_form(id) # Cookie authentication