Merge pull request #6457 from GinkgoFJG/angular_snippets

[civicrm-core.git] / CRM / Contact / Page / DedupeException.php

diff --git a/CRM/Contact/Page/DedupeException.php b/CRM/Contact/Page/DedupeException.php
index 5b9c432769d0128c490b93d20c2cf1692689f188..2ea28695ab9867c7ec3ca7848036a4c88806148e 100644 (file)
--- a/CRM/Contact/Page/DedupeException.php
+++ b/CRM/Contact/Page/DedupeException.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -44,7 +44,6 @@ class CRM_Contact_Page_DedupeException extends CRM_Core_Page {
    * the contact and calls the appropriate type of page to view.
    *
    * @return void
-   *
    */
   public function preProcess() {
     //fetch the dedupe exception contacts.
@@ -57,14 +56,15 @@ class CRM_Contact_Page_DedupeException extends CRM_Core_Page {
       $key = "{$exception->contact_id1}_{$exception->contact_id2}";
       $contactIds[$exception->contact_id1] = $exception->contact_id1;
       $contactIds[$exception->contact_id2] = $exception->contact_id2;
-      $dedupeExceptions[$key] = array('main' => array('id' => $exception->contact_id1),
+      $dedupeExceptions[$key] = array(
+        'main' => array('id' => $exception->contact_id1),
         'other' => array('id' => $exception->contact_id2),
       );
     }
     //get the dupe contacts display names.
     if (!empty($dedupeExceptions)) {
-      $sql          = 'select id, display_name from civicrm_contact where id IN ( ' . implode(', ', $contactIds) . ' )';
-      $contact      = CRM_Core_DAO::executeQuery($sql);
+      $sql = 'select id, display_name from civicrm_contact where id IN ( ' . implode(', ', $contactIds) . ' )';
+      $contact = CRM_Core_DAO::executeQuery($sql);
       $displayNames = array();
       while ($contact->fetch()) {
         $displayNames[$contact->id] = $contact->display_name;
@@ -78,13 +78,14 @@ class CRM_Contact_Page_DedupeException extends CRM_Core_Page {
   }
 
   /**
-   * This function is the main function that is called when the page loads,
+   * the main function that is called when the page loads,
    * it decides the which action has to be taken for the page.
    *
-   * return null
+   * @return null
    */
   public function run() {
     $this->preProcess();
     return parent::run();
   }
+
 }