MagicMerge - Per-request cache of path/url properties

[civicrm-core.git] / CRM / Core / BAO / UFJoin.php

diff --git a/CRM/Core/BAO/UFJoin.php b/CRM/Core/BAO/UFJoin.php
index f69b263c4031816256111bd3d7d91d03cf8e09f5..ba9dbf3fa269d9c92b165600a7014932f0cc4df0 100644 (file)
--- a/CRM/Core/BAO/UFJoin.php
+++ b/CRM/Core/BAO/UFJoin.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | 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$
  *
  */
@@ -39,7 +39,7 @@
 class CRM_Core_BAO_UFJoin extends CRM_Core_DAO_UFJoin {
 
   /**
-   * Takes an associative array and creates a uf join object
+   * Takes an associative array and creates a uf join object.
    *
    * @param array $params
    *   (reference) an assoc array of name/value pairs.
@@ -179,4 +179,5 @@ class CRM_Core_BAO_UFJoin extends CRM_Core_DAO_UFJoin {
     }
     return array($first, $second, $firstActive, $secondActive);
   }
+
 }