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

Uses queue ID when fetching newsletter link by hash

Browse Source
This commit is contained in:
Vlad
2017-05-14 20:17:07 -04:00
parent 6e700b0cfa
commit cd5f3165c7
5 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,13 +166,15 @@ class Links {
}
}
static function convertHashedLinksToShortcodesAndUrls($content, $convert_all = false) {
static function convertHashedLinksToShortcodesAndUrls($content, $queue_id, $convert_all = false) {
preg_match_all(self::getLinkRegex(), $content, $links);
$links = array_unique(Helpers::flattenArray($links));
foreach($links as $link) {
$link_hash = explode('-', $link);
if(!isset($link_hash[1])) continue;
$newsletter_link = NewsletterLink::getByHash($link_hash[1]);
$newsletter_link = NewsletterLink::where('hash', $link_hash[1])
->where('queue_id', $queue_id)
->findOne();
// convert either only link shortcodes or all hashes links if "convert all"
// option is specified
if($newsletter_link &&