diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php index 59f863b34591c..e29fa7b7bac32 100644 --- a/libraries/src/HTML/HTMLHelper.php +++ b/libraries/src/HTML/HTMLHelper.php @@ -684,6 +684,7 @@ public static function cleanImageURL($url) return $obj; } + $url = preg_replace('#&#', '&', $url); $pieces = explode('?', $url); parse_str($pieces[1], $urlParams); @@ -741,6 +742,11 @@ public static function image($file, $alt, $attribs = null, $relative = false, $r { $returnPath = (int) $returnPath; + if (strpos($file, '?') !== false) + { + $file = (static::cleanImageURL($file))->url; + } + if ($returnPath !== -1) { $includes = static::includeRelativeFiles('images', $file, $relative, false, false); diff --git a/templates/cassiopeia/offline.php b/templates/cassiopeia/offline.php index ce9578b9d3788..dfdbeac414ee0 100644 --- a/templates/cassiopeia/offline.php +++ b/templates/cassiopeia/offline.php @@ -70,8 +70,8 @@
- get('offline_image') && file_exists($app->get('offline_image'))) : ?> - + get('offline_image')) : ?> + get('offline_image'), $sitename, [], false, 0); ?> get('display_offline_message', 1) == 1 && str_replace(' ', '', $app->get('offline_message')) != '') : ?>get('offline_message'); ?>