From 432456633dd50bad376e37fe9b90b1e29838c25a Mon Sep 17 00:00:00 2001 From: pricey1981 Date: Wed, 8 Feb 2017 20:57:07 +0000 Subject: [PATCH 1/2] Update pm_shortcodes.php Where no parameter is passed in the shortcode $parm is received as an array. This resulted in 'inbox' being added to the delete url in the outbox where {PM_DELETE} is called. --- e107_plugins/pm/pm_shortcodes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index d2f2fc912..1cc0be281 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -575,13 +575,13 @@ if(!class_exists('plugin_pm_pm_shortcodes')) } - if($parm != '') + if(count($parm) == 0) { - $extra = '.'.$parm; + $extra = '.'.($this->pmMode == 'outbox' ? 'outbox' : 'inbox'); } else { - $extra = '.'.($this->pmMode == 'outbox' ? 'outbox' : 'inbox'); + $extra = '.'.$parm; } From f48066e095c386993ec807692611409499dbcc3b Mon Sep 17 00:00:00 2001 From: pricey1981 Date: Wed, 15 Feb 2017 07:14:38 +0000 Subject: [PATCH 2/2] Update pm_shortcodes.php --- e107_plugins/pm/pm_shortcodes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index 1cc0be281..c31fe8fbe 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -575,13 +575,13 @@ if(!class_exists('plugin_pm_pm_shortcodes')) } - if(count($parm) == 0) + if(!empty($parm)) { - $extra = '.'.($this->pmMode == 'outbox' ? 'outbox' : 'inbox'); + $extra = '.'.$parm; } else { - $extra = '.'.$parm; + $extra = '.'.($this->pmMode == 'outbox' ? 'outbox' : 'inbox'); }