[Joomla-commits] r21873 - in development/trunk: installation libraries/joomla/application/cli libraries/joomla/filesystem libraries/joomla/filesystem/archive libraries/joomla/installer

[dexter...@jcode001.directrouter.com]

Author: dextercowley
Date: 2011-07-16 19:01:21 -0500 (Sat, 16 Jul 2011)
New Revision: 21873

Modified:
development/trunk/installation/CHANGELOG
development/trunk/libraries/joomla/application/cli/daemon.php
development/trunk/libraries/joomla/filesystem/archive/zip.php
development/trunk/libraries/joomla/filesystem/file.php
development/trunk/libraries/joomla/filesystem/folder.php
development/trunk/libraries/joomla/installer/helper.php
Log:
[#26418] set_time_limit calls when safe mode on causes warnings

Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2011-07-16 20:22:01 UTC (rev 21872)
+++ development/trunk/installation/CHANGELOG 2011-07-17 00:01:21 UTC (rev 21873)
@@ -29,6 +29,7 @@

16-Jul-2011 Mark Dexter
^ Update sample data for 1.7 (Elin Waring)
+ # [#26418] set_time_limit calls when safe mode on causes warnings

15-Jul-2011 Jean-Marie Simonet
$ Updating installation ini files: lo-LA

Modified: development/trunk/libraries/joomla/application/cli/daemon.php
===================================================================
--- development/trunk/libraries/joomla/application/cli/daemon.php 2011-07-16 20:22:01 UTC (rev 21872)
+++ development/trunk/libraries/joomla/application/cli/daemon.php 2011-07-17 00:01:21 UTC (rev 21873)
@@ -88,7 +88,7 @@
parent::__construct();

// Set some system limits.
- set_time_limit($this->config->get('max_execution_time', 0));
+ @set_time_limit($this->config->get('max_execution_time', 0));
ini_set('memory_limit',isset($config['max_memory_limit']) ? $config['max_memory_limit'] : $this->config->get('max_memory_limit', '256M'));

// Flush content immediatly.

Modified: development/trunk/libraries/joomla/filesystem/archive/zip.php
===================================================================
--- development/trunk/libraries/joomla/filesystem/archive/zip.php 2011-07-16 20:22:01 UTC (rev 21872)
+++ development/trunk/libraries/joomla/filesystem/archive/zip.php 2011-07-17 00:01:21 UTC (rev 21873)
@@ -382,7 +382,7 @@
$entries[$name]['_dataStart'] = $lfhStart +30 + $info['Length'] + $info['ExtraLength'];

// Bump the max execution time because not using the built in php zip libs makes this process slow.
- set_time_limit(ini_get('max_execution_time'));
+ @set_time_limit(ini_get('max_execution_time'));
}
while ((($fhStart = strpos($data, $this->_ctrlDirHeader, $fhStart +46)) !== false));

Modified: development/trunk/libraries/joomla/filesystem/file.php
===================================================================
--- development/trunk/libraries/joomla/filesystem/file.php 2011-07-16 20:22:01 UTC (rev 21872)
+++ development/trunk/libraries/joomla/filesystem/file.php 2011-07-17 00:01:21 UTC (rev 21873)
@@ -322,7 +322,7 @@
*/
public static function write($file, &$buffer, $use_streams=false)
{
- set_time_limit(ini_get('max_execution_time'));
+ @set_time_limit(ini_get('max_execution_time'));

// If the destination directory doesn't exist we need to create it
if (!file_exists(dirname($file))) {

Modified: development/trunk/libraries/joomla/filesystem/folder.php
===================================================================
--- development/trunk/libraries/joomla/filesystem/folder.php 2011-07-16 20:22:01 UTC (rev 21872)
+++ development/trunk/libraries/joomla/filesystem/folder.php 2011-07-17 00:01:21 UTC (rev 21873)
@@ -33,7 +33,7 @@
*/
public static function copy($src, $dest, $path = '', $force = false, $use_streams=false)
{
- set_time_limit(ini_get('max_execution_time'));
+ @set_time_limit(ini_get('max_execution_time'));

// Initialise variables.
jimport('joomla.client.helper');
@@ -280,7 +280,7 @@
*/
public static function delete($path)
{
- set_time_limit(ini_get('max_execution_time'));
+ @set_time_limit(ini_get('max_execution_time'));

// Sanity check
if (!$path)
@@ -552,7 +552,7 @@
*/
protected static function _items($path, $filter, $recurse, $full, $exclude, $excludefilter_string, $findfiles)
{
- set_time_limit(ini_get('max_execution_time'));
+ @set_time_limit(ini_get('max_execution_time'));

// Initialise variables.
$arr = array();

Modified: development/trunk/libraries/joomla/installer/helper.php
===================================================================
--- development/trunk/libraries/joomla/installer/helper.php 2011-07-16 20:22:01 UTC (rev 21872)
+++ development/trunk/libraries/joomla/installer/helper.php 2011-07-17 00:01:21 UTC (rev 21873)
@@ -95,7 +95,7 @@
ini_set('track_errors',$track_errors);

// bump the max execution time because not using built in php zip libs are slow
- set_time_limit(ini_get('max_execution_time'));
+ @set_time_limit(ini_get('max_execution_time'));

// Return the name of the downloaded package
return basename($target);

_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits