// fix module tab dispatch

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10266 b9a71923-0436-4b27-9f14-aed3839534dd

classes/Carrier.php

@@ -50,6 +50,9 @@ class CarrierCore extends ObjectModel
 	/** @var int Tax id (none = 0) */
 	public $id_tax_rules_group;
 
+	/** @var int common id for carrier historization */
+	public $id_reference;
+
  	/** @var string Name */
 	public $name;
 
@@ -154,12 +157,12 @@ class CarrierCore extends ObjectModel
 		$fields['external_module_name'] = $this->external_module_name;
 		$fields['need_range'] = $this->need_range;
 		$fields['position'] = (int)$this->position;
+		$fields['id_reference'] = (int)$this->id_reference;
 		$fields['max_width'] = (int)$this->max_width;
 		$fields['max_height'] = (int)$this->max_height;
 		$fields['max_depth'] = (int)$this->max_depth;
 		$fields['max_weight'] = (int)$this->max_weight;
 		$fields['grade'] = (int)$this->grade;
-
 		return $fields;
 	}
 

classes/Dispatcher.php

@@ -307,7 +307,7 @@ class DispatcherCore
 				$controller_type = 'tab';
 			}
 			// For retrocompatibility with admin/tabs/ old system
-			if (isset($controller_type) && !$controller_type == 'tab')
+			if (isset($controller_type) && $controller_type == 'tab')
 			{
 				require_once(_PS_ADMIN_DIR_.'/functions.php');
 				$ajaxMode = !empty($_REQUEST['ajaxMode']);