Author: Jonathan.Wage
Date: 2010-01-12 17:59:20 +0100 (Tue, 12 Jan 2010)
New Revision: 26539
Modified:
plugins/sfSympalPlugin/trunk/lib/core/sfSympalActions.class.php
plugins/sfSympalPlugin/trunk/lib/minify/sfSympalMinifier.class.php
plugins/sfSympalPlugin/trunk/lib/task/sfSympalFixPermsTask.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing issue with minification and non existant files
Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalActions.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalActions.class.php
2010-01-12 16:10:19 UTC (rev 26538)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalActions.class.php
2010-01-12 16:59:20 UTC (rev 26539)
@@ -31,6 +31,7 @@
$items[] = sfConfig::get('sf_upload_dir');
}
$items[] = sfConfig::get('sf_cache_dir');
+ $items[] = sfConfig::get('sf_web_dir').'/cache';
$items[] = sfConfig::get('sf_config_dir');
$items[] = sfConfig::get('sf_data_dir').'/sql';
$items[] = sfConfig::get('sf_log_dir');
Modified: plugins/sfSympalPlugin/trunk/lib/minify/sfSympalMinifier.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/minify/sfSympalMinifier.class.php
2010-01-12 16:10:19 UTC (rev 26538)
+++ plugins/sfSympalPlugin/trunk/lib/minify/sfSympalMinifier.class.php
2010-01-12 16:59:20 UTC (rev 26539)
@@ -32,7 +32,10 @@
foreach ($files as $file => $options)
{
$path = sfConfig::get('sf_web_dir').'/'.$file;
- $minified .=
"\n\n".$this->{'_minify'.$typeName}(file_get_contents($path),
$this->_request->getUriPrefix().$this->_request->getRelativeUrlRoot().$file);
+ if (file_exists($path))
+ {
+ $minified .=
"\n\n".$this->{'_minify'.$typeName}(file_get_contents($path),
$this->_request->getUriPrefix().$this->_request->getRelativeUrlRoot().$file);
+ }
}
if (!is_dir($dir = dirname($cachedPath)))
Modified: plugins/sfSympalPlugin/trunk/lib/task/sfSympalFixPermsTask.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/task/sfSympalFixPermsTask.class.php
2010-01-12 16:10:19 UTC (rev 26538)
+++ plugins/sfSympalPlugin/trunk/lib/task/sfSympalFixPermsTask.class.php
2010-01-12 16:59:20 UTC (rev 26539)
@@ -29,6 +29,7 @@
$items[] = sfConfig::get('sf_upload_dir');
}
$items[] = sfConfig::get('sf_cache_dir');
+ $items[] = sfConfig::get('sf_web_dir').'/cache';
$items[] = sfConfig::get('sf_config_dir');
$items[] = sfConfig::get('sf_data_dir').'/sql';
$items[] = sfConfig::get('sf_log_dir');
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
