dépôts
/
lhc
/
web
/
www.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SPIP][PLUGINS] v3.0-->v3.2
[lhc/web/www.git]
/
www
/
plugins-dist
/
compresseur
/
lib
/
csstidy
/
class.csstidy_optimise.php
diff --git
a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_optimise.php
b/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_optimise.php
index
1ceb21f
..
bfa8372
100644
(file)
--- a/
www/plugins-dist/compresseur/lib/csstidy/class.csstidy_optimise.php
+++ b/
www/plugins-dist/compresseur/lib/csstidy/class.csstidy_optimise.php
@@
-74,7
+74,7
@@
class csstidy_optimise {
return;
}
return;
}
- if ($this->parser->get_cfg('merge_selectors') === 2) {
+ if (
(int)
$this->parser->get_cfg('merge_selectors') === 2) {
foreach ($this->css as $medium => $value) {
$this->merge_selectors($this->css[$medium]);
}
foreach ($this->css as $medium => $value) {
$this->merge_selectors($this->css[$medium]);
}
@@
-400,9
+400,9
@@
class csstidy_optimise {
if ($number[1] == '' && in_array($this->property, $unit_values, true)) {
$number[1] = 'px';
}
if ($number[1] == '' && in_array($this->property, $unit_values, true)) {
$number[1] = 'px';
}
-
} else
{
- $number[1] = '';
- }
+
} elseif ($number[1] != 's' && $number[1] != 'ms')
{
+
$number[1] = '';
+
}
$temp[$l] = $number[0] . $number[1];
}
$temp[$l] = $number[0] . $number[1];
}