From 60cb58639c0efd1f8e5e79f502ae63f21fb33596 Mon Sep 17 00:00:00 2001 From: "Marvin A. Ruder" Date: Sun, 13 Sep 2026 19:50:29 +0200 Subject: [PATCH 1/2] fix: Prefer email as Gravatar identifer when available * Fixes #10415 Signed-off-by: Marvin A. Ruder --- web/pgadmin/browser/__init__.py | 5 +++-- web/pgadmin/browser/templates/browser/js/utils.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index c6dfc86732b..1522560897d 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -383,13 +383,13 @@ def _get_supported_browser(): @blueprint.add_app_template_filter -def gravatar(username): +def gravatar(identifier): """ This function adds a template filter which returns gravatar image for user. :return: gravatar image """ - g = Gravatar(username) + g = Gravatar(identifier) return g.get_image( size=100, rating='g', @@ -555,6 +555,7 @@ def utils(): is_admin=current_user.has_role("Administrator"), login_url=login_url, username=current_user.username.replace("'","\\'"), + gravatar_identifier=(current_user.email or current_user.username).replace("'","\\'"), auth_source=auth_source, heartbeat_timeout=config.SERVER_HEARTBEAT_TIMEOUT, password_length_min=config.PASSWORD_LENGTH_MIN, diff --git a/web/pgadmin/browser/templates/browser/js/utils.js b/web/pgadmin/browser/templates/browser/js/utils.js index d8996f0dafa..e88fcff4997 100644 --- a/web/pgadmin/browser/templates/browser/js/utils.js +++ b/web/pgadmin/browser/templates/browser/js/utils.js @@ -117,7 +117,7 @@ define('pgadmin.browser.utils', userMenuInfo: { username: '{{username}}', auth_source: '{{auth_source}}', - gravatar: {% if config.SHOW_GRAVATAR_IMAGE %}'{{ username | gravatar }}'{% else %}''{% endif %}, + gravatar: {% if config.SHOW_GRAVATAR_IMAGE %}'{{ gravatar_identifier | gravatar }}'{% else %}''{% endif %}, menus: [ {% if auth_only_internal %} { From 9b1d289809c0797438a953be34b004020a6aea14 Mon Sep 17 00:00:00 2001 From: "Marvin A. Ruder" Date: Sun, 13 Sep 2026 20:05:00 +0200 Subject: [PATCH 2/2] Pass the raw identifier to the Gravatar filter Signed-off-by: Marvin A. Ruder --- web/pgadmin/browser/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 1522560897d..e4b6e44e537 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -555,7 +555,7 @@ def utils(): is_admin=current_user.has_role("Administrator"), login_url=login_url, username=current_user.username.replace("'","\\'"), - gravatar_identifier=(current_user.email or current_user.username).replace("'","\\'"), + gravatar_identifier=current_user.email or current_user.username, auth_source=auth_source, heartbeat_timeout=config.SERVER_HEARTBEAT_TIMEOUT, password_length_min=config.PASSWORD_LENGTH_MIN,