Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-10-18-35-58

[civicrm-core.git] / api / v3 / LocBlock.php

diff --git a/api/v3/LocBlock.php b/api/v3/LocBlock.php
index 17270805238c2e49eaeb4cffb33d709e155a46f7..85b4f2822d3f902925715fb0d403a1387b5419fb 100644 (file)
--- a/api/v3/LocBlock.php
+++ b/api/v3/LocBlock.php
@@ -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'])) {
+    unset($params['return']);
     $values = array();
     $items = array('address', 'email', 'phone', 'im');
     $returnAll = !empty($options['return']['all']);