X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FBAO%2FDomain.php;h=11d58a328d11d2fe5ffd080b86bdc4590c249192;hb=d6fa07ba73acb0263a0bab610fbc27636446205a;hp=e137c049763fd0bd9d23368778185d652500b4ff;hpb=8ea180b7e15f28bc58a8cffa5378fb6337cb955c;p=civicrm-core.git diff --git a/CRM/Core/BAO/Domain.php b/CRM/Core/BAO/Domain.php index e137c04976..11d58a328d 100644 --- a/CRM/Core/BAO/Domain.php +++ b/CRM/Core/BAO/Domain.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ - | 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_Domain extends CRM_Core_DAO_Domain { /** - * Cache for the current domain object + * Cache for the current domain object. */ static $_domain = NULL; @@ -49,7 +49,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { private $_location = NULL; /** - * Fetch object based on array of properties + * Fetch object based on array of properties. * * @param array $params * (reference ) an assoc array of name/value pairs. @@ -63,7 +63,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { } /** - * Get the domain BAO + * Get the domain BAO. * * @param null $reset * @@ -129,9 +129,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { } /** - * Get the location values of a domain - * - * @param NULL + * Get the location values of a domain. * * @return array * Location::getValues @@ -152,7 +150,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { } /** - * Save the values of a domain + * Save the values of a domain. * * @param array $params * @param int $id @@ -169,7 +167,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { } /** - * Create a new domain + * Create a new domain. * * @param array $params * @@ -273,15 +271,6 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { $groupID = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Group', $title, 'id', 'title', TRUE ); - if (empty($groupID) && !empty($title)) { - $groupParams = array( - 'title' => $title, - 'is_active' => 1, - 'no_parent' => 1, - ); - $group = CRM_Contact_BAO_Group::create($groupParams); - $groupID = $group->id; - } } return $groupID ? $groupID : FALSE; } @@ -333,4 +322,5 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { } return $siteContacts; } + }