mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-17 20:11:46 +02:00
Code Issues Releases Wiki Activity

Update Pageimage::render() method to accept manually defined alt or class attributes

Browse Source
This commit is contained in:
Ryan Cramer
2019-02-21 09:57:10 -05:00
parent d49df28641
commit 0c150eec42
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wire/core/Pageimage.php
View File

@@ -1704,6 +1704,8 @@ class Pageimage extends Pagefile {
* - `height` (int): Target height or 0 for current image size (or proportional if width specified). * - `height` (int): Target height or 0 for current image size (or proportional if width specified).
* - `markup` (string): Markup template string (same as $markup argument), or omit for default (same as $markup argument). * - `markup` (string): Markup template string (same as $markup argument), or omit for default (same as $markup argument).
* - `link` (bool): Link image to original size? Though you may prefer to do this with your own $markup (see examples). (default=false) * - `link` (bool): Link image to original size? Though you may prefer to do this with your own $markup (see examples). (default=false)
* - `alt` (string): Text to use for “alt” attribute (default=text from image description).
* - `class` (string): Text to use for “class” attribute, if `{class}` present in markup (default='').
* - Plus any option available to the $options argument on the `Pageimage::size()` method. * - Plus any option available to the $options argument on the `Pageimage::size()` method.
* - If you only need width and/or height, you can specify a width x height string, i.e. 123x456 (use 0 for proportional). * - If you only need width and/or height, you can specify a width x height string, i.e. 123x456 (use 0 for proportional).
* @return string * @return string
@@ -1719,7 +1721,12 @@ class Pageimage extends Pagefile {
} }
if(empty($markup)) { if(empty($markup)) {
$markup = "<img src='{url}' alt='{description}' />"; // provide default markup
if(empty($options['class'])) {
$markup = "<img src='{url}' alt='{alt}' />";
} else {
$markup = "<img src='{url}' alt='{alt}' class='{class}' />";
}
} }
if(is_string($options)) { if(is_string($options)) {
@@ -1739,7 +1746,7 @@ class Pageimage extends Pagefile {
$replacements = array(); $replacements = array();
$properties = array( $properties = array(
'url', 'httpUrl', 'URL', 'HTTPURL', 'url', 'httpUrl', 'URL', 'HTTPURL',
'description', 'alt', 'tags', 'ext', 'description', 'alt', 'tags', 'ext', 'class',
'width', 'height', 'hidpiWidth', 'hidpiHeight', 'width', 'height', 'hidpiWidth', 'hidpiHeight',
); );
@@ -1757,10 +1764,19 @@ class Pageimage extends Pagefile {
foreach($properties as $property) { foreach($properties as $property) {
$tag = '{' . $property . '}'; $tag = '{' . $property . '}';
if(strpos($markup, $tag) === false) continue; if(strpos($markup, $tag) === false) continue;
if(($property === 'alt' || $property === 'class') && isset($options[$property])) {
$value = $sanitizer->entities($options[$property]);
} else {
$value = $sanitizer->entities1($image->get($property)); $value = $sanitizer->entities1($image->get($property));
}
$replacements[$tag] = $value; $replacements[$tag] = $value;
} }
if(strpos($markup, '{class}')) {
$class = isset($options['class']) ? $this->wire('sanitizer')->entities($options['class']) : 'pw-pageimage';
$replacements["{class}"] = $class;
}
if(strpos($markup, '{original.') !== false) { if(strpos($markup, '{original.') !== false) {
if(!$original) $original = $image->getOriginal(); if(!$original) $original = $image->getOriginal();
if(!$original) $original = $image; if(!$original) $original = $image;