Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
dda9c28c
Commit
dda9c28c
authored
Jul 19, 2009
by
Dries Buytaert
Browse files
- Patch
#523520
by c960657: image_style_generate_url() and image_style_url() do the same.
parent
3cad9f41
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/image/image.module
View file @
dda9c28c
...
...
@@ -297,7 +297,7 @@ function image_style_generate() {
$destination
=
image_style_path
(
$style
[
'name'
],
$path
);
// Check that it's a defined style and that access was granted by
// image_style_
generate_
url().
// image_style_url().
if
(
!
$style
||
!
cache_get
(
'access:'
.
$style_name
.
':'
.
$path_md5
,
'cache_image'
))
{
drupal_access_denied
();
exit
();
...
...
@@ -401,32 +401,6 @@ function image_style_flush($style) {
cache_clear_all
(
'*'
,
'cache_page'
,
TRUE
);
}
/**
* Return the complete URL to an image when using a style.
*
* If the image has already been created then its location will be returned. If
* it does not then image_style_generate_url() will be called.
*
* @param $style_name
* The name of the style to be used with this image.
* @param $path
* The path to the image.
* @return
* The absolute URL where a style image can be downloaded, suitable for use
* in an <img> tag. If the site is using the default method for generating
* images, the image may not yet exist and will only be created when a
* visitor's browser requests the file.
* @see image_style_generate_url()
* @see image_style_path()
*/
function
image_style_url
(
$style_name
,
$path
)
{
$style_path
=
image_style_path
(
$style_name
,
$path
);
if
(
file_exists
(
$style_path
))
{
return
file_create_url
(
$style_path
);
}
return
image_style_generate_url
(
$style_name
,
$path
);
}
/**
* Return the URL for an image derivative given a style and image path.
*
...
...
@@ -444,14 +418,13 @@ function image_style_url($style_name, $path) {
* The absolute URL where a style image can be downloaded, suitable for use
* in an <img> tag. Requesting the URL will cause the image to be created.
* @see image_style_generate()
* @see image_style_url()
*/
function
image_style_
generate_
url
(
$style_name
,
$path
)
{
function
image_style_url
(
$style_name
,
$path
)
{
$destination
=
image_style_path
(
$style_name
,
$path
);
// If the image already exists use that rather than regenerating it.
if
(
file_exists
(
$destination
))
{
return
image_style_url
(
$style_name
,
$path
);
return
file_create_url
(
$destination
);
}
// Disable page cache for this request. This prevents anonymous users from
...
...
modules/image/image.test
View file @
dda9c28c
...
...
@@ -86,21 +86,6 @@ class ImageStylesPathAndUrlUnitTest extends DrupalWebTestCase {
$expected
=
file_create_url
(
image_style_path
(
$this
->
style_name
,
$this
->
image_with_generated
));
$this
->
assertEqual
(
$actual
,
$expected
,
t
(
'Got the download URL for an existing file.'
));
}
/**
* Test image_style_generate_url().
*/
function
testImageStyleGenerateUrl
()
{
// Test it with no generated file.
$actual
=
image_style_generate_url
(
$this
->
style_name
,
$this
->
image_without_generated
);
$expected
=
url
(
'image/generate/'
.
$this
->
style_name
.
'/'
.
$this
->
image_without_generated
,
array
(
'absolute'
=>
TRUE
));
$this
->
assertEqual
(
$actual
,
$expected
,
t
(
'Got the generate URL for a non-existent file.'
));
// Now test it with a generated file.
$actual
=
image_style_generate_url
(
$this
->
style_name
,
$this
->
image_with_generated
);
$expected
=
file_create_url
(
image_style_path
(
$this
->
style_name
,
$this
->
image_with_generated
));
$this
->
assertEqual
(
$actual
,
$expected
,
t
(
'Got the download URL for an existing file.'
));
}
}
/**
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment