// Merge -> revision 8363

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8365 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-06 12:38:55 +00:00
parent 76f895c4d5
commit 39f2f53db2
25 changed files with 11187 additions and 2208 deletions
@@ -234,7 +234,7 @@ class FrontControllerCore
 		// @todo check here
 		$page_name = Dispatcher::getInstance()->getController();
 		$page_name = (preg_match('/^[0-9]/', $page_name)) ? 'page_'.$page_name : $page_name;
-		
+
 		// Arf we in a module ?
 		if (preg_match('#^'.preg_quote($this->context->shop->getPhysicalURI(), '#').'modules/([a-zA-Z0-9_-]+?)/(.*)$#', $_SERVER['REQUEST_URI'], $m))
 			$page_name = 'module-'.$m[1].'-'.str_replace(array('.php', '/'), array('', '-'), $m[2]);