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

Merge pull request #699 from mailpoet/php53-fix

Browse Source 
Fixes various errors on PHP 5.3.x
This commit is contained in:
Jonathan Labreuille
2016-11-07 16:48:18 +01:00
committed by GitHub
parent 1a3aa7a4e4 1db8626e35
commit b36d13a087
6 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,10 @@ class Shortcodes {
}
function process($shortcodes, $content = false) {
$_this = $this;
$processed_shortcodes = array_map(
function($shortcode) use ($content) {
$shortcode_details = $this->match($shortcode);
function($shortcode) use ($content, $_this) {
$shortcode_details = $_this->match($shortcode);
$shortcode_category = !empty($shortcode_details['category']) ?
ucfirst($shortcode_details['category']) :
false;
@ -52,7 +53,7 @@ class Shortcodes {
$shortcode_details['action'] :
false;
$shortcode_class =
self::SHORTCODE_CATEGORY_NAMESPACE . $shortcode_category;
Shortcodes::SHORTCODE_CATEGORY_NAMESPACE . $shortcode_category;
$shortcode_default_value = !empty($shortcode_details['default']) ?
$shortcode_details['default'] :
false;
@ -60,9 +61,9 @@ class Shortcodes {
$custom_shortcode = apply_filters(
'mailpoet_newsletter_shortcode',
$shortcode,
$this->newsletter,
$this->subscriber,
$this->queue,
$_this->newsletter,
$_this->subscriber,
$_this->queue,
$content
);
return ($custom_shortcode === $shortcode) ?
@ -72,9 +73,9 @@ class Shortcodes {
return $shortcode_class::process(
$shortcode_action,
$shortcode_default_value,
$this->newsletter,
$this->subscriber,
$this->queue,
$_this->newsletter,
$_this->subscriber,
$_this->queue,
$content
);
}, $shortcodes);