The branch, master has been updated via 746f3566bb1f520c2a3698686bb1d9bb74a928a9 (commit) from 683a512c41a5474cb60f0e22cea4326aa359bb7a (commit) - Log ----------------------------------------------------------------- commit 746f3566bb1f520c2a3698686bb1d9bb74a928a9 Author: Piotr Przybylski <piotrprz@gmail.com> Date: Wed Aug 17 22:22:39 2011 +0200 set_time_limit may fail, make it do so silently ----------------------------------------------------------------------- Summary of changes: libraries/import/shp.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/import/shp.php b/libraries/import/shp.php index b674f59..72ff7a7 100644 --- a/libraries/import/shp.php +++ b/libraries/import/shp.php @@ -19,9 +19,9 @@ if (isset($plugin_list)) { } else { if ((int) ini_get('memory_limit') < 512) { - ini_set('memory_limit', '512M'); + @ini_set('memory_limit', '512M'); } - set_time_limit(300); + @set_time_limit(300); // Append the bfShapeFiles directory to the include path variable hooks/post-receive -- phpMyAdmin