From cc1201c7d24f650e7ec976b787193253031a0458 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jan 2014 19:45:23 +0100 Subject: glpi-fusioninventory: 0.84+2.0 --- fusioninventory-install.patch | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 fusioninventory-install.patch (limited to 'fusioninventory-install.patch') diff --git a/fusioninventory-install.patch b/fusioninventory-install.patch deleted file mode 100644 index 1f10a67..0000000 --- a/fusioninventory-install.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 9252e8e3e4d3659dd54a4ea1632ec72d194c3ed2 -Author: David Durieux -Date: Fri Sep 27 11:02:58 2013 +0200 - - Fix memory linit on install and update. closes #2259 - -diff --git /install/install.php b/install/install.php -index 7beb14a..ed6543a 100644 ---- fusioninventory/install/install.php -+++ fusioninventory/install/install.php -@@ -43,6 +43,10 @@ - function pluginFusioninventoryInstall($version, $migration='') { - global $DB; - -+ ini_set("memory_limit", "-1"); -+ ini_set("max_execution_time", "0"); -+ -+ - if ($migration == '') { - $migration = new Migration($version); - } -diff --git a/install/update.php b/install/update.php -index 9431228..f2c686f 100644 ---- fusioninventory/install/update.php -+++ fusioninventory/install/update.php -@@ -199,6 +199,8 @@ function pluginFusioninventoryUpdate($current_version, $migrationname='Migration - global $DB; - - ini_set("max_execution_time", "0"); -+ ini_set("memory_limit", "-1"); -+ - - foreach (glob(GLPI_ROOT.'/plugins/fusioninventory/inc/*.php') as $file) { - require_once($file); -- cgit