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

- Updates regex to not match http/ftp links as shortcodes

Browse Source 
- Updates regex to properly replace links in text version of newsletter
This commit is contained in:
Vlad
2016-07-27 21:57:55 -04:00
parent 420650f37f
commit 8e4d07c658
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ class Links {
// i.e., <a href="http://google.com">(http://google.com)</a> => [(http://google.com)](http://tracked_link) // i.e., <a href="http://google.com">(http://google.com)</a> => [(http://google.com)](http://tracked_link)
$regex_escaped_extracted_link = preg_quote($extracted_link['link'], '/'); $regex_escaped_extracted_link = preg_quote($extracted_link['link'], '/');
$content = preg_replace( $content = preg_replace(
'/\[(' . $regex_escaped_extracted_link . ')\](\(' . $regex_escaped_extracted_link . '\))/', '/\[(.*?)\](\(' . $regex_escaped_extracted_link . '\))/',
'[$1](' . $tracked_link . ')', '[$1](' . $tracked_link . ')',
$content $content
); );

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

@@ -25,8 +25,10 @@ class Shortcodes {
function extract($content, $categories = false) { function extract($content, $categories = false) {
$categories = (is_array($categories)) ? implode('|', $categories) : false; $categories = (is_array($categories)) ? implode('|', $categories) : false;
// match: [category:shortcode] or [category|category|...:shortcode]
// dot not match: [category://shortcode] - avoids matching http/ftp links
$regex = sprintf( $regex = sprintf(
'/\[%s:.*?\]/ism', '/\[%s:(?!\/\/).*?\]/ism',
($categories) ? '(?:' . $categories . ')' : '(?:\w+)' ($categories) ? '(?:' . $categories . ')' : '(?:\w+)'
); );
preg_match_all($regex, $content, $shortcodes); preg_match_all($regex, $content, $shortcodes);
@@ -94,4 +96,4 @@ class Shortcodes {
$shortcodes = array_intersect_key($shortcodes, $processed_shortcodes); $shortcodes = array_intersect_key($shortcodes, $processed_shortcodes);
return str_replace($shortcodes, $processed_shortcodes, $content); return str_replace($shortcodes, $processed_shortcodes, $content);
} }
} }