From f5276b10b2a56ecbb6f856b1ebf28152e35dd9e1 Mon Sep 17 00:00:00 2001 From: Tim Mallezie Date: Thu, 7 May 2015 12:15:16 +0200 Subject: [PATCH] empty is valid value for display and sort_name_format --- CRM/Admin/Form/Preferences/Display.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php index 332cc28b17..599272b50b 100644 --- a/CRM/Admin/Form/Preferences/Display.php +++ b/CRM/Admin/Form/Preferences/Display.php @@ -117,17 +117,10 @@ class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences { if ($this->_config->editor_id) { $defaults['editor_id'] = $this->_config->editor_id; } - if (empty($this->_config->display_name_format)) { - $defaults['display_name_format'] = "{contact.individual_prefix}{ }{contact.first_name}{ }{contact.last_name}{ }{contact.individual_suffix}"; - } - else { + if ($this->_config->display_name_format) { $defaults['display_name_format'] = $this->_config->display_name_format; } - - if (empty($this->_config->sort_name_format)) { - $defaults['sort_name_format'] = "{contact.last_name}{, }{contact.first_name}"; - } - else { + if ($this->_config->sort_name_format) { $defaults['sort_name_format'] = $this->_config->sort_name_format; } -- 2.25.1