Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

classes/Dispatcher.php

@@ -206,7 +206,6 @@ class DispatcherCore
 			$this->front_controller = self::FC_ADMIN;
 			$this->controller_not_found = 'adminnotfound';
 			$this->default_controller = 'adminhome';
-			$this->use_routes = false;
 		}
 		elseif (Tools::getValue('fc') == 'module')
 		{

classes/Link.php

@@ -129,8 +129,8 @@ class LinkCore
 			$params['tags'] = Tools::str2url($product->getTags($id_lang));
 		
 		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'category'))
-			$params['category'] = Tools::str2url($product->category);
-		
+			$params['category'] = !is_null($product->category) ? Tools::str2url($product->category) : Tools::str2url($category);
+
 		if ($dispatcher->hasKeyword('product_rule', $id_lang, 'reference'))
 			$params['reference'] = Tools::str2url($product->reference);