From 525ccb6876f522297f8845cec1b150a744fd0811 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Sch=C3=BCttler?= Date: Mon, 31 Jul 2017 12:30:23 +0200 Subject: [PATCH] Allow filtering when return options are set --- api/v3/Extension.php | 5 ++++- tests/phpunit/api/v3/ExtensionTest.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/v3/Extension.php b/api/v3/Extension.php index bb3735ca79..b618a37e83 100644 --- 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 2353d156e4..bb04b2a717 100644 --- 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']); } -- 2.25.1