projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4.4' into master
[civicrm-core.git]
/
api
/
v3
/
LocBlock.php
diff --git
a/api/v3/LocBlock.php
b/api/v3/LocBlock.php
index 17270805238c2e49eaeb4cffb33d709e155a46f7..cb29a2050eb064c9b75631c310232295ff84ceb3 100644
(file)
--- a/
api/v3/LocBlock.php
+++ b/
api/v3/LocBlock.php
@@
-2,9
+2,9
@@
/*
/*
+--------------------------------------------------------------------+
/*
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
3
|
+ | 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. |
| |
@@
-101,6
+101,7
@@
function civicrm_api3_loc_block_get($params) {
// If a return param has been set then fetch the appropriate fk objects
// This is a helper because api chaining does not work with a key like 'email_2'
if (!empty($options['return'])) {
// If a return param has been set then fetch the appropriate fk objects
// This is a helper because api chaining does not work with a key like 'email_2'
if (!empty($options['return'])) {
+ unset($params['return']);
$values = array();
$items = array('address', 'email', 'phone', 'im');
$returnAll = !empty($options['return']['all']);
$values = array();
$items = array('address', 'email', 'phone', 'im');
$returnAll = !empty($options['return']['all']);