Index: branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php
===================================================================
diff -u -N -r16527 -r16640
--- branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php	(.../shipping_quote_collector.php)	(revision 16527)
+++ branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php	(.../shipping_quote_collector.php)	(revision 16640)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_quote_collector.php 16527 2017-01-21 16:36:55Z alex $
+* @version	$Id: shipping_quote_collector.php 16640 2020-12-11 09:22:49Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -60,30 +60,8 @@
 		// exclude not available shipping quotes by products
 		$limit_types = unserialize($params['limit_types']);
 
-		if (is_array($limit_types) && !in_array('ANY', $limit_types)) {
-			if (count($limit_types) == 0) {
-				break;
-			}
-
-			$available_types = Array ();
-			foreach ($shipping_types as $a_type) {
-				$include = false; // exclude by default
-
-				foreach ($limit_types as $limit) {
-					$include = $include || preg_match("/^$limit/", $a_type['ShippingId']);
-					if ($include) {
-						break;
-					}
-				}
-
-				if (!$include) {
-					continue;
-				}
-
-				$available_types[ $a_type['ShippingId'] ] = $a_type;
-			}
-
-			$shipping_types = $available_types;
+		if ( is_array($limit_types) && count($limit_types) && !in_array('ANY', $limit_types) ) {
+			$shipping_types = $this->applyLimitations($shipping_types, $limit_types);
 		}
 
 		// exclude Selected Products Only shipping types, not matching products
@@ -108,6 +86,39 @@
 		return $shipping_types;
 	}
 
+	/**
+	 * Applies limitations to shipping types
+	 *
+	 * @param array $shipping_types Shipping types.
+	 * @param array $limit_types    Limit types.
+	 *
+	 * @return array
+	 */
+	protected function applyLimitations(array $shipping_types, array $limit_types)
+	{
+		$available_types = array();
+
+		foreach ( $shipping_types as $a_type ) {
+			$include = false; // Exclude by default.
+
+			foreach ( $limit_types as $limit ) {
+				$include = $include || preg_match('/^' . $limit . '/', $a_type['ShippingId']);
+
+				if ( $include ) {
+					break;
+				}
+			}
+
+			if ( !$include ) {
+				continue;
+			}
+
+			$available_types[$a_type['ShippingId']] = $a_type;
+		}
+
+		return $available_types;
+	}
+
 	function GetAvailableShippingTypes()
 	{
 		$shipping_types = Array ();