Merge branch '5907-password-recover-does-not-escape-fields-in-error-messages' into '1.4-dev'

Resolve "Password recovery does not escape fields in error messages"

See merge request fusiondirectory/fd!420

ihtml/themes/breezy/msg_dialog.tpl

@@ -41,12 +41,12 @@
       {elseif $i_Type == $smarty.const.INFO_DIALOG || $i_Type == $smarty.const.CONFIRM_DIALOG}
         <img src="geticon.php?context=status&amp;icon=dialog-information&amp;size=32" class="center" alt="{t}Information{/t}"/>
       {/if}
-        {$s_Title}
+        {$s_Title|escape}
       </h2>
     </div>
 
     <div style="z-index:250;width:100%;">
-      {$s_Message}
+      {$s_Message|escape}
     </div>
     <div class="plugbottom">
       {if $s_Trace != "" && $i_TraceCnt != 0}

include/class_msg_dialog.inc

@@ -172,8 +172,8 @@ class msg_dialog
               <img src="geticon.php?context=status&amp;icon=dialog-error&amp;size=32" alt="'._('Error').'"/>
             </td>
             <td style="width:100%">
-              <b>'.$this->s_Title.'</b><br/>
-              '.$this->s_Message.'<br><br/>
+              <b>'.htmlentities($this->s_Title, ENT_COMPAT, 'UTF-8').'</b><br/>
+              '.htmlentities($this->s_Message, ENT_COMPAT, 'UTF-8').'<br><br/>
               '._('Please fix the above error and reload the page.').'
             </td>
           </tr>