Merge pull request #210 from kartolo/release/6.0.2

Release/6.0.2
kartolo · Sep 11, 2020 · fb06570 · fb06570
2 parents 040340f + ac9ac77
commit fb06570
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Classes/Module/Dmail.php b/Classes/Module/Dmail.php
@@ -341,7 +341,7 @@ public function createDMail_quick(array $indata)
 
         // always plaintext
         $dmail['sys_dmail']['NEW']['sendOptions'] = 1;
-        $dmail['sys_dmail']['NEW']['long_link_rdct_url'] = DirectMailUtility::getUrlBase((int)$this->params['page']);
+        $dmail['sys_dmail']['NEW']['long_link_rdct_url'] = DirectMailUtility::getUrlBase((int)$this->params['pid']);
         $dmail['sys_dmail']['NEW']['subject'] = $indata['subject'];
         $dmail['sys_dmail']['NEW']['type'] = 1;
         $dmail['sys_dmail']['NEW']['pid'] = $this->pageinfo['uid'];
@@ -374,7 +374,7 @@ public function createDMail_quick(array $indata)
                 $message = DirectMailUtility::substUrlsInPlainText(
                     $message,
                     $this->params['long_link_mode']?'all':'76',
-                    DirectMailUtility::getUrlBase((int)$this->params['page'])
+                    DirectMailUtility::getUrlBase((int)$this->params['pid'])
                 );
             }
             if ($indata['breakLines']) {
@@ -440,7 +440,6 @@ public function compileQuickMail(array $row, $message)
                 ->set('charset', $htmlmail->charset)
                 ->set('mailContent', $mailContent)
                 ->set('renderedSize', strlen($mailContent))
-                ->set('long_link_rdct_url', $this->urlbase)
                 ->execute();
 
             if ($warningMsg) {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -15,7 +15,7 @@
     'description' => 'Advanced Direct Mail/Newsletter mailer system with sophisticated options for personalization of emails including response statistics.',
     'category' => 'module',
     'shy' => 0,
-    'version' => '6.0.1',
+    'version' => '6.0.2',
     'dependencies' => 'cms,tt_address',
     'conflicts' => 'sr_direct_mail_ext,it_dmail_fix,plugin_mgm,direct_mail_123',
     'priority' => '',