Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-25-23-42-42

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

diff --git a/api/v3/LocBlock.php b/api/v3/LocBlock.php
index 77f0e5d5746b2eb278007cddb88616466275dcfa..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-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -63,7 +63,7 @@ function civicrm_api3_loc_block_create($params) {
         }
         // Bother calling the api
         else {
-          $info['version'] = 3;
+          $info['version'] = $params['version'];
           $info['contact_id'] = CRM_Utils_Array::value('contact_id', $info, 'null');
           $result = civicrm_api($item, 'create', $info);
           if (!empty($result['is_error'])) {
@@ -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']);