From 0c3e2c04dbce6d60d5a86315a99a947decfda178 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 8 Dec 2016 12:33:32 +0100 Subject: [PATCH] Fix not working notification in addressbook contactform --- .../inc/class.addressbook_contactform.inc.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addressbook/inc/class.addressbook_contactform.inc.php b/addressbook/inc/class.addressbook_contactform.inc.php index 55cec5be4a..d174380b62 100644 --- a/addressbook/inc/class.addressbook_contactform.inc.php +++ b/addressbook/inc/class.addressbook_contactform.inc.php @@ -60,11 +60,6 @@ class addressbook_contactform */ function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array()) { - // allow to preset variables via get parameters - if ($_SERVER['REQUEST_METHOD'] == 'GET') - { - $content = array_merge($_GET, (array)$content); - } #error_log( "

addressbook_contactform::display(".print_r($content,true).",$addressbook,".print_r($fields,true).",$msg,$tpl_name)

\n"); if (empty($tpl_name) && !empty($content['tpl_form_name'])) $tpl_name =$content['tpl_form_name']; $tpl = new etemplate($tpl_name ? $tpl_name : 'addressbook.contactform'); @@ -220,6 +215,13 @@ class addressbook_contactform $content['captcha_task'] = sprintf('%d - %d =',$num1,$num2); $preserv['captcha_result'] = $num1-$num2; } + + // allow to preset variables via get parameters + if ($_SERVER['REQUEST_METHOD'] == 'GET') + { + $content = array_merge($_GET, (array)$content); + } + return $tpl->exec($this->callback,$content,$sel_options,array(),$preserv); } }