Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Massively simplified image_style_load() since and no longer apply

8.0.x
Greg Dunlap 2011-12-02 16:18:24 +01:00
parent a803505f4a
commit b035fb4f46
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/modules/image/image.module
View File

@ -480,41 +480,19 @@ function image_styles() {
*
* @param $name
* The name of the style.
* @param $isid
* Optional. The numeric id of a style if the name is not known.
* @param $include
* If set, this loader will restrict to a specific type of image style, may be
* one of the defined Image style storage constants.
* @return
* An image style array containing the following keys:
* - "isid": The unique image style ID.
* - "name": The unique image style name.
* - "effects": An array of image effects within this image style.
* If the image style name or ID is not valid, an empty array is returned.
* If the image style name is not valid, an empty array is returned.
* @see image_effect_load()
*/
function image_style_load($name = NULL, $isid = NULL, $include = NULL) {
function image_style_load($name = NULL) {
$styles = image_styles();
// If retrieving by name.
if (isset($name) && isset($styles[$name])) {
$style = $styles[$name];
}
// If retrieving by image style id.
if (!isset($name) && isset($isid)) {
foreach ($styles as $name => $database_style) {
if (isset($database_style['isid']) && $database_style['isid'] == $isid) {
$style = $database_style;
break;
}
}
}
// Restrict to the specific type of flag. This bitwise operation basically
// states "if the storage is X, then allow".
if (isset($style) && (!isset($include) || ($style['storage'] & (int) $include))) {
return $style;
return $styles[$name];
}
// Otherwise the style was not found.