Merge pull request #4979 from xurizaemon/codingstandards-12

[civicrm-core.git] / CRM / Admin / Form / Preferences / Display.php

diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php
index 9fcb4ed6385ec1a92fa7136ce33cbfb9889c2ccb..3ba0ddffd4d9e52d4e13d8eed3dccfab9cd0a2f4 100644 (file)
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -33,9 +33,8 @@
  *
  */
 
-/**r
- * This class generates form components for the display preferences
- *
+/**
+ * This class generates form components for the display preferences.
  */
 class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences {
   public function preProcess() {
@@ -119,8 +118,7 @@ class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences {
       $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}";
+      $defaults['display_name_format'] = "{contact.individual_prefix}{ }{contact.first_name}{ }{contact.last_name}{ }{contact.individual_suffix}";
     }
     else {
       $defaults['display_name_format'] = $this->_config->display_name_format;
@@ -174,8 +172,8 @@ class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences {
         cj("#crm-preferences-display-form-block-wysiwyg_input_format").hide()
       }';
 
-      $formats           = filter_formats();
-      $format_options    = array();
+      $formats = filter_formats();
+      $format_options = array();
       foreach ($formats as $id => $format) {
         $format_options[$id] = $format->name;
       }