Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-19-15-14-40

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

diff --git a/CRM/Core/BAO/EntityTag.php b/CRM/Core/BAO/EntityTag.php
index a43d0978d7bd75984eb43634a15e7962ab3f9ebe..c0ef14f1f3c51f547e1dbc46c9aa665a0e686e08 100644 (file)
--- a/CRM/Core/BAO/EntityTag.php
+++ b/CRM/Core/BAO/EntityTag.php
@@ -48,7 +48,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
    * @return array(
    * ) reference $tag array of category id's the contact belongs to.
    *
-   * @static
    */
   public static function &getTag($entityID, $entityTable = 'civicrm_contact') {
     $tags = array();
@@ -74,8 +73,7 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
    * @param array $params
    *   (reference ) an assoc array of name/value pairs.
    *
-   * @return CRM_Core_BAO_EntityTag object
-   * @static
+   * @return CRM_Core_BAO_EntityTag
    */
   public static function add(&$params) {
     $dataExists = self::dataExists($params);
@@ -106,7 +104,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
    *   An assoc array of name/value pairs.
    *
    * @return boolean
-   * @static
    */
   public static function dataExists($params) {
     return !($params['tag_id'] == 0);
@@ -118,8 +115,7 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
    * @param array $params
    *   (reference ) an assoc array of name/value pairs.
    *
-   * @return CRM_Core_BAO_EntityTag object
-   * @static
+   * @return CRM_Core_BAO_EntityTag
    */
   public static function del(&$params) {
     $entityTag = new CRM_Core_BAO_EntityTag();
@@ -143,7 +139,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
    *
    * @return array
    *   (total, added, notAdded) count of enities added to tag
-   * @static
    */
   public static function addEntitiesToTag(&$entityIds, $tagId, $entityTable = 'civicrm_contact') {
     $numEntitiesAdded = 0;
@@ -189,7 +184,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
    *
    * @return array
    *   (total, removed, notRemoved) count of entities removed from tags
-   * @static
    */
   public static function removeEntitiesFromTag(&$entityIds, $tagId, $entityTable = 'civicrm_contact') {
     $numEntitiesRemoved = 0;
@@ -232,7 +226,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
    * @param int $entityID
    *
    * @return void
-   * @static
    */
   public static function create(&$params, $entityTable, $entityID) {
     // get categories for the entity id
@@ -401,9 +394,9 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
    *
    * @param string $fieldName
    * @param string $context
-   *   : @see CRM_Core_DAO::buildOptionsContext.
+   *   @see CRM_Core_DAO::buildOptionsContext.
    * @param array $props
-   *   : whatever is known about this dao object.
+   *   whatever is known about this dao object.
    *
    * @return Array|bool
    */