2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/59d5d556b664/ Changeset: 59d5d556b664 Branch: next-stable User: jmchilton Date: 2014-12-09 14:33:35+00:00 Summary: Merge stable. Affected #: 11 files diff -r ac30ccd5cd1e285390706592a0b005f79456cbac -r 59d5d556b6647c245fc26f331eb01e9d597c698a templates/refresh_frames.mako --- a/templates/refresh_frames.mako +++ b/templates/refresh_frames.mako @@ -21,7 +21,7 @@ ## Refresh masthead == user changes (backward compatibility) if ( parent.user_changed ) { %if trans.user: - parent.user_changed( "${trans.user.email}", ${int( app.config.is_admin_user( trans.user ) )} ); + parent.user_changed( "${trans.user.email | h }", ${int( app.config.is_admin_user( trans.user ) )} ); %else: parent.user_changed( null, false ); %endif https://bitbucket.org/galaxy/galaxy-central/commits/b51b59a29c90/ Changeset: b51b59a29c90 User: jmchilton Date: 2014-12-09 14:33:49+00:00 Summary: Merge next-stable. Affected #: 11 files diff -r 511fbb67b820735128ee02e526fb6873beaa961e -r b51b59a29c9025290c572ecd6b842518a90a2b50 templates/refresh_frames.mako --- a/templates/refresh_frames.mako +++ b/templates/refresh_frames.mako @@ -21,7 +21,7 @@ ## Refresh masthead == user changes (backward compatibility) if ( parent.user_changed ) { %if trans.user: - parent.user_changed( "${trans.user.email}", ${int( app.config.is_admin_user( trans.user ) )} ); + parent.user_changed( "${trans.user.email | h }", ${int( app.config.is_admin_user( trans.user ) )} ); %else: parent.user_changed( null, false ); %endif Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.