From 1ec7d505b67b7fbee762fb808da86a7fb6dfcd0e Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Fri, 1 Jan 2016 19:06:46 +0100
Subject: [PATCH] Small bugfixes, almost trivial, but wrong nonetheless

---
 library/rules_shipping_framework.php | 2 +-
 rules_shipping_framework_joomla.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/rules_shipping_framework.php b/library/rules_shipping_framework.php
index 0107373..d0b6e1c 100644
--- a/library/rules_shipping_framework.php
+++ b/library/rules_shipping_framework.php
@@ -681,7 +681,7 @@ class ShippingRule {
 			"evaluate_for_products" =>      'skus',
 			"evaluate_for_skus" =>          'skus',
 			"evaluate_for_vendors" =>       'vendors',
-			"evaluate_for_manufacturers" => 'manufacturers'
+			"evaluate_for_manufacturers" => 'manufacturers',
 		);
 		
 		$conditions = array();
diff --git a/rules_shipping_framework_joomla.php b/rules_shipping_framework_joomla.php
index 0c7f75c..406e7c3 100644
--- a/rules_shipping_framework_joomla.php
+++ b/rules_shipping_framework_joomla.php
@@ -315,7 +315,7 @@ class RulesShippingFrameworkJoomla extends RulesShippingFramework {
 	protected function addPluginCartValues($cart, $products, $method, &$values) {
 		// Finally, call the triger of vmshipmentrules plugins to let them add/modify variables
 		JPluginHelper::importPlugin('vmshipmentrules');
-		JDispatcher::getInstance()->trigger('onVmShippingRulesGetCartValues',array(&$cartvals, $cart, $products, $method));
+		JDispatcher::getInstance()->trigger('onVmShippingRulesGetCartValues',array(&$values, $cart, $products, $method));
 	}
 
 	/** Filter the given array of products and return only those that belong to the categories, manufacturers, 
-- 
GitLab