diff --git a/main/controllers/Checkout.php b/main/controllers/Checkout.php
index 82e0bdd11d..6d4bfcc249 100644
--- a/main/controllers/Checkout.php
+++ b/main/controllers/Checkout.php
@@ -67,7 +67,7 @@ public function index() {
$data['_action'] = site_url('checkout');
- if (isset($order_data['order_id']) OR (isset($order_data['customer_id']) AND $order_data['customer_id'] !== $this->customer->getId())) {
+ if (isset($order_data['order_id']) OR (!empty($order_data['customer_id']) AND $order_data['customer_id'] !== $this->customer->getId())) {
$order_data = array();
$this->session->unset_userdata('order_data');
}
diff --git a/main/views/themes/tastyigniter-orange/account/reviews.php b/main/views/themes/tastyigniter-orange/account/reviews.php
index 1571dab251..747749a05b 100644
--- a/main/views/themes/tastyigniter-orange/account/reviews.php
+++ b/main/views/themes/tastyigniter-orange/account/reviews.php
@@ -29,7 +29,7 @@
-
+
diff --git a/system/tastyigniter/libraries/User.php b/system/tastyigniter/libraries/User.php
index 0111814d9c..2e3e3b88c9 100644
--- a/system/tastyigniter/libraries/User.php
+++ b/system/tastyigniter/libraries/User.php
@@ -203,14 +203,11 @@ private function setPermissions() {
}
foreach ($group_permissions as $permission_id => $permitted_actions) {
- if (!empty($permissions[$permission_id]['name']) AND $permission_name = $permissions[$permission_id]['name']
- AND !empty(array_intersect($permitted_actions, $this->available_actions[$permission_name]))) {
-
- $this->permitted_actions[$permission_name] = $permitted_actions;
+ if (!empty($permissions[$permission_id]['name']) AND $permission_name = $permissions[$permission_id]['name']) {
+ $intersect = array_intersect($permitted_actions, $this->available_actions[$permission_name]);
+ if (!empty($intersect)) $this->permitted_actions[$permission_name] = $permitted_actions;
}
}
-
-
}
}