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

Conflicts: modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
parent 46dc93fd7e 89c65536d7
commit 2ba5dc18fd
68 changed files with 1072 additions and 861 deletions
@@ -309,7 +309,13 @@ class AdminDashboardControllerCore extends AdminController
 		
 		die(Tools::jsonEncode(Hook::exec('dashboardData', $params, $id_module, true, true, (int)Tools::getValue('dashboard_use_push'))));
 	}
-	
+
+	public function ajaxProcessSetSimulationMode()
+	{
+		Configuration::updateValue('PS_DASHBOARD_SIMULATION', (int)Tools::getValue('PS_DASHBOARD_SIMULATION'));
+		die ('k'.Configuration::get('PS_DASHBOARD_SIMULATION').'k');
+	}
+
 	public function ajaxProcessGetBlogRss()
 	{
 		$return = array('has_errors' => false, 'rss' => array());