The branch, QA_3_4 has been updated via a691fce64ca56c90d0d4b9af525a785d95eabd6b (commit) from f7cb55cb626158d81ac606927142d8f55444b9ff (commit)
- Log ----------------------------------------------------------------- -----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/import/ods.php | 3 --- libraries/import/xml.php | 3 --- 3 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 904e529..f852519 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 4bf5200..d50bee9 100644 --- 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 = ""; diff --git a/libraries/import/xml.php b/libraries/import/xml.php index 640aac8..36af788 100644 --- 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 = "";
hooks/post-receive