Merge pull request #72 from sampoyigi/develop

Develop
tastyigniter · Aug 11, 2015 · 93c66e1 · 93c66e1
2 parents 4b0781e + 382a2a4
commit 93c66e1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -29,7 +29,7 @@
 
 			<div class="<?php echo $class; ?>">
 				<div class="row">
-					<div class="col-md-12">
+					<div class="col-md-12 reviews-list">
 						<div class="table-responsive">
 						<table class="table table-hover">
 							<thead>

diff --git 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;
                 }
             }
-
-
         }
     }