From 63ef3f3e8c027b596e9bc29710087d713bee0ddd Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Tue, 12 Mar 2013 10:16:54 +0100
Subject: [PATCH] // Moved layered rules from top to bottom in order to avoid
 conflicts

---
 classes/Dispatcher.php                        | 25 ++++++++++---------
 .../admin/AdminPerformanceController.php      |  4 +++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index a0381064c..497ef6d03 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -45,18 +45,6 @@ class DispatcherCore
 	 * @var array List of default routes
 	 */
 	public $default_routes = array(
-		'layered_rule' => array(
-			'controller' =>	'category',
-			'rule' =>		'{id}-{rewrite}{/:selected_filters}',
-			'keywords' => array(
-				'id' =>				array('regexp' => '[0-9]+', 'param' => 'id_category'),
-				/* Selected filters is used by the module blocklayered */
-				'selected_filters' =>		array('regexp' => '.*', 'param' => 'selected_filters'),
-				'rewrite' =>		array('regexp' => '[_a-zA-Z0-9-\pL]*'),
-				'meta_keywords' =>	array('regexp' => '[_a-zA-Z0-9-\pL]*'),
-				'meta_title' =>		array('regexp' => '[_a-zA-Z0-9-\pL]*'),
-			),
-		),
 		'category_rule' => array(
 			'controller' =>	'category',
 			'rule' =>		'{id}-{rewrite}',
@@ -136,6 +124,19 @@ class DispatcherCore
 				'tags' =>			array('regexp' => '[a-zA-Z0-9-\pL]*'),
 			),
 		),
+		// Must be after the product and category rules in order to avoid conflict
+		'layered_rule' => array(
+			'controller' =>	'category',
+			'rule' =>		'{id}-{rewrite}{/:selected_filters}',
+			'keywords' => array(
+				'id' =>				array('regexp' => '[0-9]+', 'param' => 'id_category'),
+				/* Selected filters is used by the module blocklayered */
+				'selected_filters' =>		array('regexp' => '.*', 'param' => 'selected_filters'),
+				'rewrite' =>		array('regexp' => '[_a-zA-Z0-9-\pL]*'),
+				'meta_keywords' =>	array('regexp' => '[_a-zA-Z0-9-\pL]*'),
+				'meta_title' =>		array('regexp' => '[_a-zA-Z0-9-\pL]*'),
+			),
+		),
 	);
 
 	/**
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index 6f2716319..be2ff4b25 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -649,6 +649,10 @@ class AdminPerformanceControllerCore extends AdminController
 					$base_urls['_MEDIA_SERVER_1_'] = Tools::getValue('_MEDIA_SERVER_1_');
 					$base_urls['_MEDIA_SERVER_2_'] = Tools::getValue('_MEDIA_SERVER_2_');
 					$base_urls['_MEDIA_SERVER_3_'] = Tools::getValue('_MEDIA_SERVER_3_');
+					if ($base_urls['_MEDIA_SERVER_1_'] || $base_urls['_MEDIA_SERVER_2_'] || $base_urls['_MEDIA_SERVER_3_'])
+						Configuration::updateValue('PS_MEDIA_SERVERS', 1);
+					else
+						Configuration::updateValue('PS_MEDIA_SERVERS', 0);
 					rewriteSettingsFile($base_urls, null, null);
 					Tools::generateHtaccess(null, null, null, '', null, array($base_urls['_MEDIA_SERVER_1_'], $base_urls['_MEDIA_SERVER_2_'], $base_urls['_MEDIA_SERVER_3_']));
 					unset($this->_fieldsGeneral['_MEDIA_SERVER_1_']);