From 5c67b073aea2766a6cbbc88b1fbcc2c2c1928e14 Mon Sep 17 00:00:00 2001
From: Renato Atilio <renatoat@gmail.com>
Date: Fri, 9 Dec 2022 14:01:43 -0300
Subject: [PATCH] FIX: broken emoji url on password reset w/ subfolder (#19373)

* FIX: broken emoji url on password reset w/ subfolder

* Use Discourse.base_path to account for subfolder

I do like where you are going with using Emoji.url_for but due to the
lack of svg support currently I think we need to use the current svg
file we have. The emoji png files we have render too blurry at high
resolution.

This commit uses the `Discourse.base_path` so that a subfolder install
will have the correct image path.

I do think in the future we should do some work around using a helper
similar to Emoji.url_for with svg support so that we better standardize
our use of these emojis.

Co-authored-by: Blake Erickson <o.blakeerickson@gmail.com>
---
 app/views/invites/show.html.erb         | 2 +-
 app/views/users/password_reset.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/invites/show.html.erb b/app/views/invites/show.html.erb
index 08051aecfe9..d9c30e42036 100644
--- a/app/views/invites/show.html.erb
+++ b/app/views/invites/show.html.erb
@@ -2,7 +2,7 @@
   <%if flash[:error]%>
     <div class='invite-error'>
       <div class="error-image">
-        <img src="/images/sweat-smile-face.svg" alt="sweat-smile-face emoji">
+        <img src="<%= Discourse.base_path + '/images/sweat-smile-face.svg' %>" alt="sweat-smile-face emoji">
       </div>
       <div class="error-info">
         <%=flash[:error].html_safe%>
diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb
index 2cb06b1add8..3b2c52afa1f 100644
--- a/app/views/users/password_reset.html.erb
+++ b/app/views/users/password_reset.html.erb
@@ -2,7 +2,7 @@
   <%if @error%>
     <div class='invite-error'>
       <div class="error-image">
-        <img src="/images/sweat-smile-face.svg" alt="sweat-smile-face emoji">
+        <img src="<%= Discourse.base_path + '/images/sweat-smile-face.svg' %>" alt="sweat-smile-face emoji">
       </div>
       <div class="error-info">
         <%= @error.html_safe %>