Author: caefer
Date: 2010-03-30 20:26:11 +0200 (Tue, 30 Mar 2010)
New Revision: 28889
Modified:
plugins/sfImageTransformExtraPlugin/trunk/lib/source/sfImageSourceDoctrine.class.php
plugins/sfImageTransformExtraPlugin/trunk/test/fixtures/model/TestRecord.php
Log:
bugfix: symfony models usually only store the filename not the path
Modified:
plugins/sfImageTransformExtraPlugin/trunk/lib/source/sfImageSourceDoctrine.class.php
===================================================================
---
plugins/sfImageTransformExtraPlugin/trunk/lib/source/sfImageSourceDoctrine.class.php
2010-03-30 18:25:25 UTC (rev 28888)
+++
plugins/sfImageTransformExtraPlugin/trunk/lib/source/sfImageSourceDoctrine.class.php
2010-03-30 18:26:11 UTC (rev 28889)
@@ -66,11 +66,8 @@
throw new sfError404Exception('Could not find "'.$url['host'].'"
#'.$url['fragment'].'!');
}
$attribute = ltrim($url['path'], '/');
- $attribute = $obj->$attribute;
- $pos = strrpos($attribute, '/');
- $path = substr($attribute, 0, $pos);
- $file = substr($attribute, $pos+1);
- $files =
sfFinder::type('file')->name($file.'*')->in(sfConfig::get('sf_upload_dir').$path);
+ $filepath =
sfConfig::get('sf_upload_dir').'/'.strtolower(get_class($obj)).'/'.$obj->$attribute;
+ $files =
sfFinder::type('file')->name(basename($filepath))->in(dirname($filepath));
return $files[0];
}
}
Modified:
plugins/sfImageTransformExtraPlugin/trunk/test/fixtures/model/TestRecord.php
===================================================================
---
plugins/sfImageTransformExtraPlugin/trunk/test/fixtures/model/TestRecord.php
2010-03-30 18:25:25 UTC (rev 28888)
+++
plugins/sfImageTransformExtraPlugin/trunk/test/fixtures/model/TestRecord.php
2010-03-30 18:26:11 UTC (rev 28889)
@@ -32,7 +32,7 @@
public function getFile()
{
- return '/testrecord/daphne.jpg';
+ return 'daphne.jpg';
}
}
--
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.
