From 370d56eb246530db880cbdf455be82242f76310e Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 30 Nov 2016 12:49:34 -0500 Subject: [PATCH] CRM-16189 - Fix orderBy caching of option values --- CRM/Core/OptionGroup.php | 2 +- tests/phpunit/CRM/Core/OptionGroupTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php index c6a6d93960..2c99877aa6 100644 --- a/CRM/Core/OptionGroup.php +++ b/CRM/Core/OptionGroup.php @@ -121,7 +121,7 @@ class CRM_Core_OptionGroup { $orderBy = 'weight' ) { $cache = CRM_Utils_Cache::singleton(); - $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName); + $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName, $orderBy); if (!$fresh) { // Fetch from static var diff --git a/tests/phpunit/CRM/Core/OptionGroupTest.php b/tests/phpunit/CRM/Core/OptionGroupTest.php index 1bb9b052e3..afd48f7eb7 100644 --- a/tests/phpunit/CRM/Core/OptionGroupTest.php +++ b/tests/phpunit/CRM/Core/OptionGroupTest.php @@ -43,8 +43,8 @@ class CRM_Core_OptionGroupTest extends CiviUnitTestCase { */ public function testWeightOptionGroup() { $values = array(); - $options1 = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, NULL, 'label', FALSE, TRUE); - $options2 = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, NULL, 'label', FALSE, TRUE, 'value', 'name'); + $options1 = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, NULL, 'label', FALSE); + $options2 = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, NULL, 'label', FALSE, FALSE, 'value', 'name'); // Verify that arrays are equal. $this->assertTrue(($options1 == $options2), "The arrays retrieved should be the same"); // Verify sequence is different. -- 2.25.1