Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39

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

diff --git a/CRM/Core/BAO/Website.php b/CRM/Core/BAO/Website.php
index 5319f19f36800610f761047b3f4f7b70b92ee76c..050502c14a06a627791d074da0cbce864a2ea9e8 100644 (file)
--- a/CRM/Core/BAO/Website.php
+++ b/CRM/Core/BAO/Website.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$
  *
  */
@@ -63,7 +63,9 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
    * process website
    *
    * @param array $params associated array
-   * @param int   $contactID contact id
+   * @param int $contactID contact id
+   *
+   * @param $skipDelete
    *
    * @return void
    * @access public
@@ -127,7 +129,10 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
    * Given the list of params in the params array, fetch the object
    * and store the values in the values array
    *
-   * @param array entityBlock input parameters to find object
+   * @param $params
+   * @param $values
+   *
+   * @internal param \entityBlock $array input parameters to find object
    *
    * @return boolean
    * @access public
@@ -156,6 +161,8 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
    *
    * @param int $id the contact id
    *
+   * @param bool $updateBlankLocInfo
+   *
    * @return array  the array of website details
    * @access public
    * @static