Merge pull request #87 from oc-shopaholic/develop

Release version 1.29.0
oc-shopaholic · Mar 12, 2020 · c853ce8 · c853ce8
2 parents 79fe8ec + 9eb64a6
commit c853ce8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/classes/collection/ElementCollection.php b/classes/collection/ElementCollection.php
@@ -394,9 +394,17 @@ public function random($iCount = 1)
         }
 
         $obThis = $this->copy();
-        shuffle($obThis->arElementIDList);
 
-        return $obThis->take($iCount);
+        $arElementIDList = $obThis->getIDList();
+        $arKeyList = array_rand($arElementIDList, $iCount);
+        if (!is_array($arKeyList)) {
+            $arKeyList = [$arKeyList];
+        }
+
+        $arKeyList = array_combine($arKeyList, $arKeyList);
+        $arElementIDList = array_intersect_key($arElementIDList, $arKeyList);
+
+        return $obThis->intersect($arElementIDList)->all();
     }
 
     /**

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -93,4 +93,6 @@
 1.28.0:
     - 'Added dimension fields to lang files'
 1.28.1:
-    - 'Added passing $this param to get[FieldName]Attribute() method in ElementItem class. It is recommended to use parameter from callback function in the dynamic methods get[FieldName]Attribute in ElementItem class.'
+    - 'Added passing $this param to get[FieldName]Attribute() method in ElementItem class. It is recommended to use parameter from callback function in the dynamic methods get[FieldName]Attribute in ElementItem class.'
+1.29.0:
+    - 'Improved speed of random method in ElementCollection class.'