// Merge -> revision 9061

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:21:55 +00:00
parent 51de6be6cc
commit b4d436ca21
53 changed files with 795 additions and 456 deletions
@@ -559,9 +559,13 @@ if (Tools::isSubmit('helpAccess'))

 if (Tools::isSubmit('getHookableList'))
 {
+	if (!strlen(Tools::getValue('hooks_list')))
+		die('{"hasError" : true, "errors" : ["Live Edit : no module on this page"]}');
+	
 	$modules_list = explode(',', Tools::getValue('modules_list'));
 	$hooks_list = explode(',', Tools::getValue('hooks_list'));
 	$hookableList = array();
+	
 	foreach ($modules_list as $module)
 	{
 		$module = trim($module);
@@ -581,6 +585,7 @@ if (Tools::isSubmit('getHookableList'))
 		}

 	}
+	$hookableList['hasError'] = false;
 	die(Tools::jsonEncode($hookableList));
 }