joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-07-02 18:13:43 +00:00
Code Packages Releases Activity

Merge commit '3bbcf65e25e0e81d27b0e1cf40c38671c8658b06' into 4.1-dev

Browse Source 
# Conflicts:
#	layouts/joomla/html/image.php
This commit is contained in:
Benjamin Trenkle 2022-01-31 21:46:33 +01:00
commit 52074f1ff1
No known key found for this signature in database
GPG Key ID: F6BBF5456D4762FF
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layouts/joomla/html/image.php
View File

@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage Layout
*
* @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
* @copyright (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
@ -19,9 +19,12 @@ defined('_JEXEC') or die;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\Utilities\ArrayHelper;
$img = HTMLHelper::_('cleanImageURL', $displayData['src']);
if (isset($displayData['src']))
{
$displayData['src'] = $this->escape($displayData['src']);
}
$displayData['src'] = $this->escape($img->url);
$img = HTMLHelper::_('cleanImageURL', $displayData['src']);
if (isset($displayData['alt']))
{