projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2937 from seamuslee001/master
[civicrm-core.git]
/
api
/
v3
/
Domain.php
diff --git
a/api/v3/Domain.php
b/api/v3/Domain.php
index 0044289becabdc51cfdb602731476a763b270780..365708f4de53c4c9b30e5e856db362d4ff0a404f 100644
(file)
--- a/
api/v3/Domain.php
+++ b/
api/v3/Domain.php
@@
-2,9
+2,9
@@
/*
+--------------------------------------------------------------------+
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-32,7
+32,7
@@
* @package CiviCRM_APIv3
* @subpackage API_Domain
*
* @package CiviCRM_APIv3
* @subpackage API_Domain
*
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* @version $Id: Domain.php 30171 2010-10-14 09:11:27Z mover $
*
*/
* @version $Id: Domain.php 30171 2010-10-14 09:11:27Z mover $
*
*/
@@
-44,11
+44,11
@@
*/
function civicrm_api3_domain_get($params) {
*/
function civicrm_api3_domain_get($params) {
- $params['version'] = CRM_Utils_
a
rray::value('domain_version', $params);
+ $params['version'] = CRM_Utils_
A
rray::value('domain_version', $params);
unset($params['version']);
$bao = new CRM_Core_BAO_Domain();
unset($params['version']);
$bao = new CRM_Core_BAO_Domain();
- if (
CRM_Utils_Array::value('current_domain', $params
)) {
+ if (
!empty($params['current_domain']
)) {
$domainBAO = CRM_Core_Config::domainID();
$params['id'] = $domainBAO;
}
$domainBAO = CRM_Core_Config::domainID();
$params['id'] = $domainBAO;
}