| @@ -302,9 +302,9 @@ | ||
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | // load filters |
| 305 | 305 | public function load_filters() { |
| 306 | - add_filter('fluentform/submission_message_parse', array($this, 'filter_submission_message_parse'), 10, 2); | |
| 306 | + add_filter('fluentform/submission_message_parse', array($this, 'filter_submission_message_parse'), 9, 2); | |
| 307 | 307 | add_filter('fluentform/filter_email_attachments', array($this, 'filter_email_attachments'), 10, 4); |
| 308 | 308 | add_filter('fluentform/integration_data_trello', array($this, 'filter_integration_data_trello'), 10, 3); |
| 309 | 309 | add_filter('fluentform/insert_response_data', array($this, 'filter_fluentform_insert_response_data'), 99, 3); |
| 310 | 310 | add_filter('fluentform/redirect_url_value', array($this, 'filter_fluentform_redirect_url_value'), 10, 3); |
| @@ -436,14 +436,16 @@ | ||
| 436 | 436 | } |
| 437 | 437 | } |
| 438 | 438 | $message = str_replace($shortcode_value, '', $message); |
| 439 | 439 | } else { |
| 440 | - | |
| 441 | 440 | if (!isset($atts['iframe_download']) && $this->get('iframe_download')) { |
| 442 | 441 | $shortcode[3] .= ' iframe_download="true"'; |
| 443 | 442 | $atts['iframe_download'] = 'true'; |
| 444 | 443 | } |
| 445 | - | |
| 444 | + if (!isset($atts['iframe_loader']) && $this->get('iframe_download')) { | |
| 445 | + $shortcode[3] .= ' iframe_loader="true"'; | |
| 446 | + $atts['iframe_loader'] = 'true'; | |
| 447 | + } | |
| 446 | 448 | // iframe onload attribute bug |
| 447 | 449 | if ($shortcode[2] === 'e2pdf-view' || ($shortcode[2] === 'e2pdf-download' && (isset($atts['iframe_download']) && $atts['iframe_download'] == 'true'))) { |
| 448 | 450 | $message = str_replace($shortcode_value, '[' . $shortcode[2] . $shortcode[3] . ']', $message); |
| 449 | 451 | } else { |
| @@ -1477,8 +1479,9 @@ | ||
| 1477 | 1479 | if ($source) { |
| 1478 | 1480 | $dom = new DOMDocument(); |
| 1479 | 1481 | $html = $this->helper->load('convert')->load_html($source, $dom, true); |
| 1480 | 1482 | } |
| 1483 | + | |
| 1481 | 1484 | if (ob_get_length() > 0) { |
| 1482 | 1485 | while (@ob_end_clean()); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged |
| 1483 | 1486 | } |
| 1484 | 1487 | if (!$source) { |
| @@ -1499,8 +1502,13 @@ | ||
| 1499 | 1502 | $elements = $xpath->query('//*[@name="' . $name . '"]'); |
| 1500 | 1503 | foreach ($elements as $element) { |
| 1501 | 1504 | $element->parentNode->removeChild($element); |
| 1502 | 1505 | } |
| 1506 | + } | |
| 1507 | + | |
| 1508 | + $elements = $xpath->query("//*[contains(@class, 'fluentform-step')]"); | |
| 1509 | + foreach ($elements as $element) { | |
| 1510 | + $xml->set_node_value($element, 'style', ''); | |
| 1503 | 1511 | } |
| 1504 | 1512 | |
| 1505 | 1513 | $elements = $xpath->query("//*[contains(@class, 'ff_tc_checkbox')]"); |
| 1506 | 1514 | foreach ($elements as $element) { |
