mirror_php/TCPDF
1
0
Fork 0
mirror of https://github.com/tecnickcom/TCPDF.git synced 2025-03-20 22:19:39 +01:00
Code Issues Projects Releases Wiki Activity

Remove "U" modifier from regexes (#359)

Browse Source 
* Revert "Optimized regular expression (#268)"

This reverts commit f0e42daeaef04c89c903d3c270edc580024221ea.

* do not use U regex modifier

* fix #267
This commit is contained in:
Michael Voříšek 2021-07-20 16:25:58 +02:00 committed by GitHub
parent bf02c1cb62
commit c4c3e054f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tcpdf.php
View File

@ -16348,15 +16348,15 @@ class TCPDF {
$css = array();
// get CSS array defined at previous call
$matches = array();
if (preg_match_all('/<cssarray>([^\<]*)<\/cssarray>/isU', $html, $matches) > 0) {
if (preg_match_all('/<cssarray>([^\<]*?)<\/cssarray>/is', $html, $matches) > 0) {
if (isset($matches[1][0])) {
$css = array_merge($css, json_decode($this->unhtmlentities($matches[1][0]), true));
}
$html = preg_replace('/<cssarray>(.*?)<\/cssarray>/isU', '', $html);
$html = preg_replace('/<cssarray>(.*?)<\/cssarray>/is', '', $html);
}
// extract external CSS files
$matches = array();
if (preg_match_all('/<link([^\>]*)>/isU', $html, $matches) > 0) {
if (preg_match_all('/<link([^\>]*?)>/is', $html, $matches) > 0) {
foreach ($matches[1] as $key => $link) {
$type = array();
if (preg_match('/type[\s]*=[\s]*"text\/css"/', $link, $type)) {
@ -16379,7 +16379,7 @@ class TCPDF {
}
// extract style tags
$matches = array();
if (preg_match_all('/<style([^\>]*)>([^\<]*)<\/style>/isU', $html, $matches) > 0) {
if (preg_match_all('/<style([^\>]*?)>([^\<]*?)<\/style>/is', $html, $matches) > 0) {
foreach ($matches[1] as $key => $media) {
$type = array();
preg_match('/media[\s]*=[\s]*"([^"]*)"/', $media, $type);
@ -16394,8 +16394,8 @@ class TCPDF {
// create a special tag to contain the CSS array (used for table content)
$csstagarray = '<cssarray>'.htmlentities(json_encode($css)).'</cssarray>';
// remove head and style blocks
$html = preg_replace('/<head([^\>]*)>(.*)?<\/head>/siU', '', $html);
$html = preg_replace('/<style([^\>]*)>([^\<]*)<\/style>/isU', '', $html);
$html = preg_replace('/<head([^\>]*?)>(.*?)<\/head>/is', '', $html);
$html = preg_replace('/<style([^\>]*?)>([^\<]*?)<\/style>/is', '', $html);
// define block tags
$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td');
// define self-closing tags