[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11002-g7e27edb

[Piotr Przybylski]

The branch, master has been updated
       via  7e27edbb6d15e0cbac446de4b7083568dbf20210 (commit)
      from  b857e9580757a84132fc8ccd820a549115af7e2d (commit)


- Log -----------------------------------------------------------------
commit 7e27edbb6d15e0cbac446de4b7083568dbf20210
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Wed Jul 20 16:57:07 2011 +0200

    Hide warnings that may arise from ini_set('memory_limit', ...) and set_time_limit when used in safe_mode

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

Summary of changes:
 bs_disp_as_mime_type.php  |    2 +-
 libraries/import/ods.php  |    4 ++--
 libraries/import/xls.php  |    4 ++--
 libraries/import/xlsx.php |    4 ++--
 libraries/import/xml.php  |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php
index 03a8c8b..9ec0ec5 100644
--- a/bs_disp_as_mime_type.php
+++ b/bs_disp_as_mime_type.php
@@ -13,7 +13,7 @@ require_once './libraries/common.inc.php';
 PMA_checkParameters(array('reference', 'c_type'));
 
 // Increase time limit, because fetching blob might take some time
-set_time_limit(0);
+ at set_time_limit(0);
 
 $reference = $_REQUEST['reference'];
 /*
diff --git a/libraries/import/ods.php b/libraries/import/ods.php
index 29952f9..7f850c6 100644
--- a/libraries/import/ods.php
+++ b/libraries/import/ods.php
@@ -35,8 +35,8 @@ if (isset($plugin_list)) {
     return;
 }
 
-ini_set('memory_limit', '128M');
-set_time_limit(120);
+ at ini_set('memory_limit', '128M');
+ at set_time_limit(120);
 
 $i = 0;
 $len = 0;
diff --git a/libraries/import/xls.php b/libraries/import/xls.php
index f7e3d33..78cdef5 100644
--- a/libraries/import/xls.php
+++ b/libraries/import/xls.php
@@ -31,8 +31,8 @@ if (isset($plugin_list)) {
     return;
 }
 
-ini_set('memory_limit', '256M');
-set_time_limit(120);
+ at ini_set('memory_limit', '256M');
+ at set_time_limit(120);
 
 /* Append the PHPExcel directory to the include path variable */
 set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php
index 2b5f628..33308c6 100644
--- a/libraries/import/xlsx.php
+++ b/libraries/import/xlsx.php
@@ -31,8 +31,8 @@ if (isset($plugin_list)) {
     return;
 }
 
-ini_set('memory_limit', '256M');
-set_time_limit(120);
+ at ini_set('memory_limit', '256M');
+ at set_time_limit(120);
 
 /* Append the PHPExcel directory to the include path variable */
 set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
index 8fe45d8..db9ba6e 100644
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -28,8 +28,8 @@ if (isset($plugin_list)) {
     return;
 }
 
-ini_set('memory_limit', '128M');
-set_time_limit(120);
+ at ini_set('memory_limit', '128M');
+ at set_time_limit(120);
 
 $i = 0;
 $len = 0;


hooks/post-receive
-- 
phpMyAdmin