From c483617c522069bc59bba8da5300488020ee3c03 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 3 Apr 2016 17:30:39 -0700 Subject: [PATCH] Private Messenger: Fix for replying --- e107_plugins/pm/pm_shortcodes.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index feb5dbb9d..9cab3b3c4 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -120,6 +120,11 @@ if(!class_exists('plugin_pm_pm_shortcodes')) $userTo = $this->sc_pm_form_touser(); $classTo = $this->sc_pm_form_toclass(); + if(!empty($this->var['pm_from'])) + { + return e107::getForm()->hidden('pm_to', $this->var['pm_from']).$this->var['from_name']; + } + if(deftrue('BOOTSTRAP')) { @@ -153,9 +158,9 @@ if(!class_exists('plugin_pm_pm_shortcodes')) // TODO Get rid of e107_handlers/user_select_class.php public function sc_pm_form_touser() { - if(vartrue($this->var['from_name'])) //TODO What's this? + if(vartrue($this->var['from_name'])) { - // return "{$this->var['from_name']}"; + return "{$this->var['from_name']}"; } // require_once(e_HANDLER.'user_select_class.php'); @@ -243,7 +248,7 @@ if(!class_exists('plugin_pm_pm_shortcodes')) if(isset($_POST['quote'])) { $t = time(); - $value = "[quote{$t}={$this->var['from_name']}]\n{$this->var['pm_text']}\n[/quote{$t}]\n\n"; + $value = "\n\n\n\n\n\n\n[quote{$t}={$this->var['from_name']}]\n".trim($this->var['pm_text'])."[/quote{$t}]"; } } return ""; @@ -252,7 +257,13 @@ if(!class_exists('plugin_pm_pm_shortcodes')) public function sc_pm_emotes() { - // require_once(e_HANDLER.'emote.php'); + $active = e107::pref('core','smiley_activate'); + + if(empty($active)) + { + return null; + } + return r_emote(); }