[Fmsystem-commits] [16373] avoid conflic on custom fields

[sigurdne]

Revision: 16373
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16373
Author:   sigurdne
Date:     2017-02-22 08:30:16 -0500 (Wed, 22 Feb 2017)
Log Message:
-----------
avoid conflic on custom fields

Modified Paths:
--------------
    trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
    trunk/helpdesk/inc/class.sogeneric.inc.php
    trunk/rental/inc/class.sogeneric.inc.php

Modified: trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.hook_helper.inc.php    2017-02-22 
08:04:10 UTC (rev 16372)
+++ trunk/eventplannerfrontend/inc/class.hook_helper.inc.php    2017-02-22 
13:30:16 UTC (rev 16373)
@@ -205,7 +205,7 @@
                        $account_id = 
(int)$GLOBALS['hook_values']['account_id'];
                        $headers = getallheaders();
                        $ssn = $headers['uid'];
-       _debug_array($headers);
+
                        if(!$ssn)
                        {
                                return;

Modified: trunk/helpdesk/inc/class.sogeneric.inc.php
===================================================================
--- trunk/helpdesk/inc/class.sogeneric.inc.php  2017-02-22 08:04:10 UTC (rev 
16372)
+++ trunk/helpdesk/inc/class.sogeneric.inc.php  2017-02-22 13:30:16 UTC (rev 
16373)
@@ -142,6 +142,7 @@
                                                'add_msg' => lang('add'),
                                                'name' => lang('response 
template'),
                                                'acl_app' => 'helpdesk',
+                                               'system_location' => 
'.ticket.response_template',
                                                'acl_location' => '.ticket',
                                                'menu_selection' => 
'helpdesk::response_template',
                                                'default' => array

Modified: trunk/rental/inc/class.sogeneric.inc.php
===================================================================
--- trunk/rental/inc/class.sogeneric.inc.php    2017-02-22 08:04:10 UTC (rev 
16372)
+++ trunk/rental/inc/class.sogeneric.inc.php    2017-02-22 13:30:16 UTC (rev 
16373)
@@ -200,6 +200,7 @@
                                                'add_msg' => lang('add'),
                                                'name' => lang('email 
template'),
                                                'acl_app' => 'rental',
+                                               'system_location' => 
'.email_out.email_template',
                                                'acl_location' => '.email_out',
                                                'menu_selection' => 
'rental::email_out::email_template',
                                                'default' => array