aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2012-07-02 13:09:09 +0000
committermistic100 <mistic@piwigo.org>2012-07-02 13:09:09 +0000
commit787c716b66ba54dea44172c6d2e53f64a06a52cb (patch)
tree766efc654470b1546a9ecfeded9c4cb110b23f06
parenta07dd0bea0980d196e018f87e7682680255ca934 (diff)
Merged revision(s) 16278 from trunk:
bug 2674: cssmin 3.0.1 requires PHP 5.2.4 git-svn-id: http://piwigo.org/svn/branches/2.4@16279 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/template.class.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/template.class.php b/include/template.class.php
index 3b585c199..b1707bca1 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -1364,8 +1364,11 @@ final class FileCombiner
private static function process_css($file)
{
$css = self::process_css_rec($file);
- require_once(PHPWG_ROOT_PATH.'include/cssmin.class.php');
- $css = CssMin::minify($css, array('Variables'=>false));
+ if (version_compare(PHP_VERSION, '5.2.4', '>='))
+ {
+ require_once(PHPWG_ROOT_PATH.'include/cssmin.class.php');
+ $css = CssMin::minify($css, array('Variables'=>false));
+ }
$css = trigger_event('combined_css_postfilter', $css);
return $css;
}