bug #3428627 [import] ODS import ignores memory limits

2011-10-31 12:35:02 -04:00
parent f7cb55cb62
commit a691fce64c
3 changed files with 1 additions and 6 deletions
--- a/1
+++ b/1
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #3426840 [interface] ENUM/SET editor can't handle commas in values
 - bug #3427256 [interface] no links to browse/empty views and tables
 - bug #3430377 [interface] Deleted search results remain visible
+- bug #3428627 [import] ODS import ignores memory limits

 3.4.7.0 (2011-10-23)
 - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
--- a/libraries/import/ods.php
+++ b/libraries/import/ods.php
@@ -35,9 +35,6 @@ if (isset($plugin_list)) {
    return;
 }

-ini_set('memory_limit', '128M');
-set_time_limit(120);
-
 $i = 0;
 $len = 0;
 $buffer = "";
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -28,9 +28,6 @@ if (isset($plugin_list)) {
    return;
 }

-ini_set('memory_limit', '128M');
-set_time_limit(120);
-
 $i = 0;
 $len = 0;
 $buffer = "";