Merge branch 'master' into master-civimail-abtest

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

diff --git a/CRM/Contact/Page/DedupeRules.php b/CRM/Contact/Page/DedupeRules.php
index 629d992367e2b9e76287f4250410c471bb3f41b1..f46bcbd800f8b1a2d9330f5b926516a64be7382b 100644 (file)
--- a/CRM/Contact/Page/DedupeRules.php
+++ b/CRM/Contact/Page/DedupeRules.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -202,12 +202,17 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
   /**
    * Get user context
    *
+   * @param null $mode
+   *
    * @return string  user context
    */
   function userContext($mode = NULL) {
     return 'civicrm/contact/deduperules';
   }
 
+  /**
+   * @param int $id
+   */
   function delete($id) {
     $ruleDao = new CRM_Dedupe_DAO_Rule();
     $ruleDao->dedupe_rule_group_id = $id;