Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

- Updates codes based on Taut's comments

Browse Source
This commit is contained in:
Vlad
2016-04-15 11:36:57 -04:00
parent 599661e028
commit af4d29ebe6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Cron/Workers/SendingQueue.php
View File

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

5
lib/Newsletter/Links/Links.php
View File

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

2
lib/Newsletter/Shortcodes/Categories/Subscription.php
View File

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

3
lib/Newsletter/Shortcodes/Shortcodes.php
View File

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