[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21953-g00576dc

[Marc Delisle]

The branch, master has been updated
       via  00576dc1bb97e9f94a4658218e6957b2154c25f0 (commit)
       via  028e9ee6d94fc42337d2e37941dc35ee3f91de86 (commit)
       via  a691fce64ca56c90d0d4b9af525a785d95eabd6b (commit)
      from  b47803b05c1058751d21563155c9927a8146f3c8 (commit)


- Log -----------------------------------------------------------------
commit 00576dc1bb97e9f94a4658218e6957b2154c25f0
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Oct 31 12:36:45 2011 -0400

    Fix merge conflicts

commit 028e9ee6d94fc42337d2e37941dc35ee3f91de86
Merge: b47803b a691fce
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Oct 31 12:35:12 2011 -0400

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

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 a23a65e..682b45b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,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 b6857d5..ab9729b 100644
--- a/libraries/import/ods.php
+++ b/libraries/import/ods.php
@@ -35,9 +35,6 @@ if (isset($plugin_list)) {
     return;
 }
 
- at ini_set('memory_limit', '128M');
- at set_time_limit(120);
-
 $i = 0;
 $len = 0;
 $buffer = "";
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
index 65f99bd..a3768cd 100644
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -28,9 +28,6 @@ if (isset($plugin_list)) {
     return;
 }
 
- at ini_set('memory_limit', '128M');
- at set_time_limit(120);
-
 $i = 0;
 $len = 0;
 $buffer = "";


hooks/post-receive
-- 
phpMyAdmin