Skip to content
This repository has been archived by the owner on Mar 1, 2018. It is now read-only.

Commit

Permalink
Merge pull request #10 from gimler/fix_php_warning
Browse files Browse the repository at this point in the history
Fix php warning
  • Loading branch information
caefer committed Jun 14, 2011
2 parents 4f1bbbe + 3c16b1a commit a09bcfc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/cache/sfRawFileCache.class.php
Expand Up @@ -64,7 +64,7 @@ protected function write($path, $data, $timeout)
if (!is_dir(dirname($path)))
{
// create directory structure if needed
mkdir(dirname($path) , 0777, true);
mkdir(dirname($path), 0777, true);
}

$tmpFile = tempnam(dirname($path) , basename($path));
Expand Down Expand Up @@ -144,7 +144,7 @@ protected function getGlobPatterns(sfRoute $route)
$paths = array();
for($i=$depth; $i<=$routeOptions['max_folder_depth']; $i++)
{
$paths[] = $pathBase.$pathStart.str_repeat('*/', $i - $depth).'*'.$pathEnd;;
$paths[] = $pathBase.$pathStart.str_repeat('*/', $i - $depth).'*'.$pathEnd;
}
return $paths;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/routing/sfImageTransformRoute.class.php
Expand Up @@ -171,12 +171,12 @@ public function preassemblePattern($params = array())
{
$params = $this->convertObjectToArray($params);

if(!$params['sf_format'])
if(!isset($params['sf_format']))
{
$params['sf_format'] = '{jpg,gif,png}';
}

if(!$params['format'])
if(!isset($params['format']))
{
$params['format'] = '{'.implode(',', array_keys(sfConfig::get('thumbnailing_formats'))).'}';
}
Expand Down

0 comments on commit a09bcfc

Please sign in to comment.