- Updates codes based on Taut's comments

lib/Cron/Workers/SendingQueue.php

@@ -76,7 +76,7 @@ class SendingQueue {
     if($queue->newsletter_rendered_body === null) {
       // render newsletter
       $rendered_newsletter = $this->renderNewsletter($newsletter);
-      if((boolean) Setting::getValue('tracking.enabled') === true) {
+      if((boolean) Setting::getValue('tracking.enabled')) {
         // extract and replace links
         $processed_newsletter = $this->processLinks(
           $this->joinObject($rendered_newsletter),
@@ -205,7 +205,7 @@ class SendingQueue {
       $subscriber,
       $this->joinObject($data_for_shortcodes)
     );
-    if((boolean) Setting::getValue('tracking.enabled') === true) {
+    if((boolean) Setting::getValue('tracking.enabled')) {
       $processed_newsletter = $this->replaceLinks(
         $newsletter['id'],
         $subscriber['id'],

lib/Newsletter/Links/Links.php

@@ -37,10 +37,11 @@ class Links {
       . ')'
       . ')\\1#';
     preg_match_all($regex, $text, $links);
-    preg_match_all(Shortcodes::$shortcodes_regex, $text, $shortcodes);
+    $shortcodes = new Shortcodes();;
+    $shortcodes = $shortcodes->extract($text);
     return array_merge(
       array_unique($links[2]),
-      array_unique($shortcodes[0])
+      $shortcodes
     );
   }
 

lib/Newsletter/Shortcodes/Categories/Subscription.php

@@ -62,7 +62,7 @@ class Subscription {
   }
 
   static function getShortcodeUrl($shortcode, $url) {
-    return ((boolean) Setting::getValue('tracking.enabled') === true) ?
+    return ((boolean) Setting::getValue('tracking.enabled')) ?
       $shortcode :
       $url;
   }

lib/Newsletter/Shortcodes/Shortcodes.php

@@ -4,7 +4,6 @@ namespace MailPoet\Newsletter\Shortcodes;
 class Shortcodes {
   public $newsletter;
   public $subscriber;
-  static $shortcodes_regex = '/\[(?:\w+):.*?\]/ism';
 
   function __construct(
     $newsletter = false,
@@ -15,7 +14,7 @@ class Shortcodes {
   }
 
   function extract($text) {
-    preg_match_all(self::$shortcodes_regex, $text, $shortcodes);
+    preg_match_all('/\[(?:\w+):.*?\]/ism', $text, $shortcodes);
     return array_unique($shortcodes[0]);
   }