Allow filtering when return options are set

diff --git a/api/v3/Extension.php b/api/v3/Extension.php
index bb3735ca79dae7cf95cf075646043d4ae3af5ff7..b618a37e83e7484ee234d37147e20ccaf034669f 100644 (file)
--- a/api/v3/Extension.php
+++ b/api/v3/Extension.php
@@ -359,7 +359,10 @@ function civicrm_api3_extension_get($params) {
     }
   }
   $options = _civicrm_api3_get_options_from_params($params);
-  $returnFields = !empty($options['return']) ? $options['return'] : array('id');
+  $returnFields = !empty($options['return']) ? $options['return'] : array();
+  if (!in_array('id', $returnFields)) {
+    $returnFields = array_merge($returnFields, array('id'));
+  }
   return _civicrm_api3_basic_array_get('Extension', $params, $result, 'id', $returnFields);
 }
 

diff --git a/tests/phpunit/api/v3/ExtensionTest.php b/tests/phpunit/api/v3/ExtensionTest.php
index 2353d156e4848a80f5e482614593a9d95552c99d..bb04b2a7175b3d80d1b99598627c82e04dab0382 100644 (file)
--- a/tests/phpunit/api/v3/ExtensionTest.php
+++ b/tests/phpunit/api/v3/ExtensionTest.php
@@ -109,7 +109,7 @@ class api_v3_ExtensionTest extends CiviUnitTestCase {
    * Test that extension get can be filtered by id.
    */
   public function testGetExtensionByID() {
-    $result = $this->callAPISuccess('extension', 'get', array('id' => 2));
+    $result = $this->callAPISuccess('extension', 'get', array('id' => 2, 'return' => array('label')));
     $this->assertEquals(1, $result['count']);
   }