Merge pull request #3949 from colemanw/CRM-15156

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

diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php
index 6e0872681a24ef073fd5d905c7c1a86b8907f97c..61a9370068ef3ac94440cccdf877a438533cffca 100644 (file)
--- a/CRM/Core/BAO/Email.php
+++ b/CRM/Core/BAO/Email.php
@@ -128,6 +128,8 @@ WHERE  contact_id = {$params['contact_id']}
    *
    * @param int $id the contact id
    *
+   * @param bool $updateBlankLocInfo
+   *
    * @return array  the array of email id's
    * @access public
    * @static
@@ -318,6 +320,9 @@ AND    reset_date IS NULL
     return $fromEmailValues;
   }
 
+  /**
+   * @return object
+   */
   static function isMultipleBulkMail() {
     return CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, 'civimail_multiple_bulk_emails', NULL, FALSE);
   }