// MERGE with 1.4 r7770

2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
@@ -36,8 +36,11 @@ include_once(dirname(__FILE__).'/twenga.php');
 if ((sha1(Configuration::get('TWENGA_TOKEN')._COOKIE_KEY_)) != Tools::getValue('twenga_token'))
 	die('FATAL ERROR : INVALID TOKEN');

+if (!ini_get('safe_mode'))
+	@set_time_limit(300);
+
 $export = new Twenga();
 $output = $export->buildXML();
 if (empty($export->_errors))
 	header("Content-type: text/xml; charset=utf-8");
-echo $output;
+echo $output;