Fix for non-SEF'ed URL in list email plugin, plus normalize links if …

…WYSIWYG.

plugins/fabrik_list/email/models/email.php

@@ -11,6 +11,7 @@
 // No direct access
 defined('_JEXEC') or die('Restricted access');
 
+use Fabrik\Helpers\Pdf;
 use Fabrik\Helpers\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
@@ -129,7 +130,7 @@ public function onLoadJavascriptInstance($args)
 			$url .= '&' . $opts->additionalQS;
 		}
 
-		$opts->popupUrl = JRoute::_($url);
+		$opts->popupUrl = JRoute::_($url, false);
 		$opts               = json_encode($opts);
 		$this->jsInstance   = "new FbListEmail($opts)";
 
@@ -687,6 +688,11 @@ private function _send($row, $mailTo)
 
 		$thisMsg = $w->parseMessageForPlaceholder($thisMsg, $row);
 
+		if ($params->get('wysiwyg', true))
+		{
+			Pdf::fullPaths($thisMsg);
+		}
+
 		if ($sendSMS)
 		{
 			return $this->sendSMS($mailTo, $thisMsg, $row);
@@ -962,6 +968,11 @@ private function mailMerged($firstRow, $mergedMsg, $sent, $notSent)
 			$mergedMsg = $coverMessage . $mergedMsg;
 		}
 
+		if ($params->get('wysiwyg', true))
+		{
+			Pdf::fullPaths($coverMessage);
+		}
+
 		if ($toHow == 'single')
 		{
 			foreach ($thisTos as $toKey => $thisTo)