Resolve merge conflict

bramley · suelaP · commit 9cb0a7dfe860 · 2020-06-17T15:12:24.000+02:00
diff --git a/public_html/lists/admin/send_core.php b/public_html/lists/admin/send_core.php
@@ -728,7 +728,7 @@ function submitform() {
     $maincontent .= '
       <div id="remoteurl" class="field"><label for="sendurl">' .$GLOBALS['I18N']->get('Send a Webpage - URL').Help('sendurl').'</label>'.'
         <input type="text" name="sendurl" id="remoteurlinput"
-       value="' .$messagedata['sendurl'].'" size="60" /> <span id="remoteurlstatus"></span></div>';
+       value="' .htmlspecialchars($messagedata['sendurl']).'" size="60" /> <span id="remoteurlstatus"></span></div>';
     if (isset($messagedata['sendmethod']) && $messagedata['sendmethod'] != 'remoteurl') {
         $GLOBALS['pagefooter']['hideremoteurl'] = '<script type="text/javascript">$("#remoteurl").hide();</script>';
     }

Original file line number	Diff line number	Diff line change
`@@ -728,7 +728,7 @@ function submitform() {`
`728`	`728`	`$maincontent .= '`
`729`	`729`	`<div id="remoteurl" class="field"><label for="sendurl">' .$GLOBALS['I18N']->get('Send a Webpage - URL').Help('sendurl').'</label>'.'`
`730`	`730`	`<input type="text" name="sendurl" id="remoteurlinput"`
`731`		`- value="' .$messagedata['sendurl'].'" size="60" /> <span id="remoteurlstatus"></span></div>';`
	`731`	`+ value="' .htmlspecialchars($messagedata['sendurl']).'" size="60" /> <span id="remoteurlstatus"></span></div>';`
`732`	`732`	`if (isset($messagedata['sendmethod']) && $messagedata['sendmethod'] != 'remoteurl') {`
`733`	`733`	`$GLOBALS['pagefooter']['hideremoteurl'] = '<script type="text/javascript">$("#remoteurl").hide();</script>';`
`734`	`734`	`}`