Merge pull request #3927 from eileenmcnaughton/CRM-15168

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

diff --git a/CRM/Core/BAO/Location.php b/CRM/Core/BAO/Location.php
index 41e6a50f28245c56b30423bb03e34ee724edaf88..092e86e08936ca1dd8e6600b640d118b22ea9b4e 100644 (file)
--- a/CRM/Core/BAO/Location.php
+++ b/CRM/Core/BAO/Location.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$
  *
  */
@@ -46,10 +46,12 @@ class CRM_Core_BAO_Location extends CRM_Core_DAO {
   /**
    * Function to create various elements of location block
    *
-   * @param array    $params       (reference ) an assoc array of name/value pairs
-   * @param boolean  $fixAddress   true if you need to fix (format) address values
+   * @param array $params (reference ) an assoc array of name/value pairs
+   * @param boolean $fixAddress true if you need to fix (format) address values
    *                               before inserting in db
    *
+   * @param null $entity
+   *
    * @return array   $location
    * @access public
    * @static
@@ -234,8 +236,11 @@ WHERE e.id = %1";
    * Given the list of params in the params array, fetch the object
    * and store the values in the values array
    *
-   * @param array $params        input parameters to find object
-   * @param array $values        output values of the object
+   * @param $entityBlock
+   * @param bool $microformat
+   *
+   * @internal param array $params input parameters to find object
+   * @internal param array $values output values of the object
    *
    * @return array   array of objects(CRM_Core_BAO_Location)
    * @access public
@@ -305,6 +310,12 @@ WHERE e.id = %1";
    * @param  int  $updateLocBlockId update location block id
    * @return int  newly created/updated location block id.
    */
+  /**
+   * @param $locBlockId
+   * @param null $updateLocBlockId
+   *
+   * @return mixed
+   */
   static function copyLocBlock($locBlockId, $updateLocBlockId = NULL) {
     //get the location info.
     $defaults = $updateValues = array();