Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Conditionally uses set_time_limit() when function is not disabled

Browse Source
This commit is contained in:
Vlad
2017-08-11 12:15:12 -04:00
parent f35b66b3cf
commit 6fe5b7e0c5
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Subscribers/ImportExport/Export/Export.php
View File

@@ -1,4 +1,5 @@
<?php
namespace MailPoet\Subscribers\ImportExport\Export;
use MailPoet\Config\Env;
@@ -26,7 +27,9 @@ class Export {
public $subscriber_batch_size;
public function __construct($data) {
set_time_limit(0);
if(strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
set_time_limit(0);
}
$this->export_confirmed_option = $data['export_confirmed_option'];
$this->export_format_option = $data['export_format_option'];
$this->group_by_segment_option = $data['group_by_segment_option'];
@@ -47,7 +50,7 @@ class Export {
function process() {
try {
if(is_writable($this->export_path) === false) {
throw new \Exception(__("The export file could not be saved on the server.", 'mailpoet'));
throw new \Exception(__('The export file could not be saved on the server.', 'mailpoet'));
}
if(!extension_loaded('zip')) {
throw new \Exception(__('Export requires a ZIP extension to be installed on the host.', 'mailpoet'));
@@ -211,7 +214,7 @@ class Export {
} else {
// if all subscribers belong to at least one segment, select the segment name
$subscribers = $subscribers
->selectExpr('MAX('.Segment::$_table . '.name) as segment_name')
->selectExpr('MAX(' . Segment::$_table . '.name) as segment_name')
->whereIn(SubscriberSegment::$_table . '.segment_id', $this->segments);
}
if($this->group_by_segment_option) {
@@ -273,4 +276,4 @@ class Export {
return $subscriber[$field];
}, $this->subscriber_fields);
}
}
}