Merge branch '4.1-dev' into Add-support-ID-with-0-for-value-CheckboxF…

…ield.php

build/media_source/templates/site/cassiopeia/scss/blocks/_tags.scss

@@ -11,5 +11,5 @@
 
 .tag {
   display: inline-block;
-  padding: .5rem 0;
+  padding: .5rem .5rem .5rem 0;
 }

components/com_content/src/View/Category/FeedView.php

@@ -12,11 +12,10 @@
 \defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\MVC\View\CategoryFeedView;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
 /**
@@ -50,13 +49,10 @@ protected function reconcileNames($item)
 		$params            = $app->getParams();
 		$item->description = '';
 		$obj = json_decode($item->images);
-		$introImage = $obj->{'image_intro'} ?? '';
 
-		if (isset($introImage) && ($introImage != ''))
+		if (!empty($obj->image_intro))
 		{
-			$item->description = '<p>'
-				. LayoutHelper::render('joomla.html.image', ['src' => preg_match('/http/', $introImage) ? $introImage : Uri::root() . $introImage])
-				. '</p>';
+			$item->description = '<p>' . HTMLHelper::_('image', $obj->image_intro, $obj->image_intro_alt) . '</p>';
 		}
 
 		$item->description .= ($params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext);

components/com_content/src/View/Featured/FeedView.php

@@ -14,11 +14,10 @@
 use Joomla\CMS\Categories\Categories;
 use Joomla\CMS\Document\Feed\FeedItem;
 use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\MVC\View\AbstractView;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
 /**
@@ -64,13 +63,10 @@ public function display($tpl = null)
 
 			$description = '';
 			$obj = json_decode($row->images);
-			$introImage = $obj->{'image_intro'} ?? '';
 
-			if (isset($introImage) && ($introImage != ''))
+			if (!empty($obj->image_intro))
 			{
-				$description = '<p>'
-				. LayoutHelper::render('joomla.html.image', ['src' => preg_match('/http/', $introImage) ? $introImage : Uri::root() . $introImage])
-				. '</p>';
+				$description = '<p>' . HTMLHelper::_('image', $obj->image_intro, $obj->image_intro_alt) . '</p>';
 			}
 
 			$description .= ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);

components/com_content/tmpl/categories/default_items.php

@@ -11,7 +11,6 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
@@ -46,7 +45,7 @@ class="btn btn-secondary btn-sm"
 					<?php endif; ?>
 				</div>
 				<?php if ($this->params->get('show_description_image') && $item->getParams()->get('image')) : ?>
-					<?php echo LayoutHelper::render('joomla.html.image', ['src' => $item->getParams()->get('image'), 'alt' => $item->getParams()->get('image_alt')]); ?>
+					<?php echo HTMLHelper::_('image', $item->getParams()->get('image'), $item->getParams()->get('image_alt')); ?>
 				<?php endif; ?>
 				<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
 					<?php if ($item->description) : ?>

components/com_finder/tmpl/search/default_result.php

@@ -12,7 +12,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Finder\Administrator\Helper\LanguageHelper;
 use Joomla\Component\Finder\Administrator\Indexer\Helper;
@@ -73,14 +72,13 @@
 ?>
 <li class="result__item">
 	<?php if ($showImage && isset($this->result->imageUrl)) : ?>
-		<figure class="<?php echo htmlspecialchars($imageclass, ENT_COMPAT, 'UTF-8'); ?> result__image">
-			<?php $extraAttr = array_merge($extraAttr, ['src' => $this->result->imageUrl, 'alt' => $this->result->imageAlt]); ?>
+		<figure class="<?php echo htmlspecialchars($imageClass, ENT_COMPAT, 'UTF-8'); ?> result__image">
 			<?php if ($this->params->get('link_image') && $this->result->route) : ?>
 				<a href="<?php echo Route::_($this->result->route); ?>">
-					<?php echo LayoutHelper::render('joomla.html.image', $extraAttr); ?>
+					<?php echo HTMLHelper::_('image', $this->result->imageUrl, $this->result->imageAlt, $extraAttr); ?>
 				</a>
 			<?php else : ?>
-				<?php echo LayoutHelper::render('joomla.html.image', $extraAttr); ?>
+				<?php echo HTMLHelper::_('image', $this->result->imageUrl, $this->result->imageAlt, $extraAttr); ?>
 			<?php endif; ?>
 		</figure>
 	<?php endif; ?>

components/com_tags/tmpl/tag/default.php

@@ -10,7 +10,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Layout\LayoutHelper;
 
 // Note that there are certain parts of this layout used only when there is exactly one tag.
 $isSingleTag = count($this->item) === 1;
@@ -36,7 +35,7 @@
 		<div class="com-tags-tag__description category-desc">
 			<?php $images = json_decode($this->item[0]->images); ?>
 			<?php if ($this->params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
-				<?php echo LayoutHelper::render('joomla.html.image', ['src' => $images->image_fulltext, 'alt' => $images->image_fulltext_alt]); ?>
+				<?php echo HTMLHelper::_('image', $images->image_fulltext, $images->image_fulltext_alt); ?>
 			<?php endif; ?>
 			<?php if ($this->params->get('tag_list_show_tag_description') == 1 && $this->item[0]->description) : ?>
 				<?php echo HTMLHelper::_('content.prepare', $this->item[0]->description, '', 'com_tags.tag'); ?>
@@ -47,7 +46,7 @@
 	<?php // If there are multiple tags and a description or image has been supplied use that. ?>
 	<?php if ($this->params->get('tag_list_show_tag_description', 1) || $this->params->get('show_description_image', 1)) : ?>
 		<?php if ($this->params->get('show_description_image', 1) == 1 && $this->params->get('tag_list_image')) : ?>
-			<?php echo LayoutHelper::render('joomla.html.image', ['src' => $this->params->get('tag_list_image'), 'alt' => empty($this->params->get('tag_list_image_alt')) && empty($this->params->get('tag_list_image_alt_empty')) ? false : $this->params->get('tag_list_image_alt')]); ?>
+			<?php echo HTMLHelper::_('image', $this->params->get('tag_list_image'), empty($this->params->get('tag_list_image_alt')) && empty($this->params->get('tag_list_image_alt_empty')) ? false : $this->params->get('tag_list_image_alt')); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('tag_list_description', '') > '') : ?>
 			<?php echo HTMLHelper::_('content.prepare', $this->params->get('tag_list_description'), '', 'com_tags.tag'); ?>

components/com_tags/tmpl/tag/default_items.php

@@ -12,7 +12,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Tags\Site\Helper\RouteHelper;
@@ -93,7 +92,7 @@ class="inputbox" onchange="document.adminForm.submit();"
 				<?php $images  = json_decode($item->core_images); ?>
 				<?php if ($this->params->get('tag_list_show_item_image', 1) == 1 && !empty($images->image_intro)) : ?>
 					<a href="<?php echo Route::_(RouteHelper::getItemRoute($item->content_item_id, $item->core_alias, $item->core_catid, $item->core_language, $item->type_alias, $item->router)); ?>">
-						<?php echo LayoutHelper::render('joomla.html.image', ['src' => $images->image_intro, 'alt' => $images->image_intro_alt]); ?>
+						<?php echo HTMLHelper::_('image', $images->image_intro, $images->image_intro_alt); ?>
 					</a>
 				<?php endif; ?>
 				<?php if ($this->params->get('tag_list_show_item_description', 1)) : ?>

components/com_tags/tmpl/tag/list.php

@@ -10,7 +10,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Layout\LayoutHelper;
 
 // Note that there are certain parts of this layout used only when there is exactly one tag.
 $n    = count($this->items);
@@ -37,7 +36,7 @@
 		<div class="com-tags-tag-list__description category-desc">
 			<?php $images = json_decode($this->item[0]->images); ?>
 			<?php if ($this->params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
-				<?php echo LayoutHelper::render('joomla.html.image', ['src' => $images->image_fulltext]); ?>
+				<?php echo HTMLHelper::_('image', $images->image_fulltext, ''); ?>
 			<?php endif; ?>
 			<?php if ($this->params->get('tag_list_show_tag_description') == 1 && $this->item[0]->description) : ?>
 				<?php echo HTMLHelper::_('content.prepare', $this->item[0]->description, '', 'com_tags.tag'); ?>
@@ -48,7 +47,7 @@
 	<?php // If there are multiple tags and a description or image has been supplied use that. ?>
 	<?php if ($this->params->get('tag_list_show_tag_description', 1) || $this->params->get('show_description_image', 1)) : ?>
 		<?php if ($this->params->get('show_description_image', 1) == 1 && $this->params->get('tag_list_image')) : ?>
-			<?php echo LayoutHelper::render('joomla.html.image', ['src' => $this->params->get('tag_list_image'), 'alt' => empty($this->params->get('tag_list_image_alt')) && empty($this->params->get('tag_list_image_alt_empty')) ? false : $this->params->get('tag_list_image_alt')]); ?>
+			<?php echo HTMLHelper::_('image', $this->params->get('tag_list_image'), empty($this->params->get('tag_list_image_alt')) && empty($this->params->get('tag_list_image_alt_empty')) ? false : $this->params->get('tag_list_image_alt')); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('tag_list_description', '') > '') : ?>
 			<?php echo HTMLHelper::_('content.prepare', $this->params->get('tag_list_description'), '', 'com_tags.tag'); ?>

components/com_tags/tmpl/tags/default.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\HTML\HTMLHelper;
 
 // Note that there are certain parts of this layout used only when there is exactly one tag.
 $description      = $this->params->get('all_tags_description');
@@ -23,7 +23,7 @@
 	<?php endif; ?>
 	<?php if ($this->params->get('all_tags_show_description_image') && !empty($descriptionImage)) : ?>
 		<div class="com-tags__image">
-			<?php echo LayoutHelper::render('joomla.html.image', ['src' => $descriptionImage, 'alt' => empty($this->params->get('all_tags_description_image_alt')) && empty($this->params->get('all_tags_description_image_alt_empty')) ? false : $this->params->get('all_tags_description_image_alt')]); ?>
+			<?php echo HTMLHelper::_('image', $descriptionImage, empty($this->params->get('all_tags_description_image_alt')) && empty($this->params->get('all_tags_description_image_alt_empty')) ? false : $this->params->get('all_tags_description_image_alt')); ?>
 		</div>
 	<?php endif; ?>
 	<?php if (!empty($description)) : ?>

components/com_tags/tmpl/tags/default_items.php

@@ -12,7 +12,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Tags\Site\Helper\RouteHelper;
@@ -108,12 +107,12 @@ class="inputbox" onchange="document.adminForm.submit();"
 						<?php if (!empty($images->image_intro)) : ?>
 							<?php $imgfloat = empty($images->float_intro) ? $this->params->get('float_intro') : $images->float_intro; ?>
 							<div class="float-<?php echo htmlspecialchars($imgfloat, ENT_QUOTES, 'UTF-8'); ?> item-image">
-								<?php $imageOptions = ['src' => $images->image_intro, 'alt' => $images->image_intro_alt]; ?>
+								<?php $imageOptions = []; ?>
 								<?php if ($images->image_intro_caption) : ?>
 										<?php $imageOptions['title'] = $images->image_intro_caption; ?>
 										<?php $imageOptions['class'] = 'caption'; ?>
 								<?php endif; ?>
-								<?php echo LayoutHelper::render('joomla.html.image', $imageOptions); ?>
+								<?php echo HTMLHelper::_('image', $images->image_intro, $images->image_intro_alt, $imageOptions); ?>
 							</div>
 						<?php endif; ?>
 					</span>

components/com_users/tmpl/login/default_login.php

@@ -12,7 +12,6 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 
@@ -40,7 +39,7 @@
 		<?php endif; ?>
 
 		<?php if ($this->params->get('login_image') != '') : ?>
-			<?php echo LayoutHelper::render('joomla.html.image', ['src' => $this->params->get('login_image'), 'class' => 'com-users-login__image login-image', 'alt' => empty($this->params->get('login_image_alt')) && empty($this->params->get('login_image_alt_empty')) ? false : $this->params->get('login_image_alt')]); ?>
+			<?php echo HTMLHelper::_('image', $this->params->get('login_image'), empty($this->params->get('login_image_alt')) && empty($this->params->get('login_image_alt_empty')) ? false : $this->params->get('login_image_alt'), ['class' => 'com-users-login__image login-image']); ?>
 		<?php endif; ?>
 
 	<?php if (($this->params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?>

components/com_users/tmpl/login/default_logout.php

@@ -11,7 +11,6 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 
 ?>
@@ -33,7 +32,7 @@
 	<?php endif; ?>
 
 	<?php if ($this->params->get('logout_image') != '') : ?>
-		<?php echo LayoutHelper::render('joomla.html.image', ['src' => $this->params->get('logout_image'), 'class' => 'com-users-logout__image thumbnail float-end logout-image', 'alt' => empty($this->params->get('logout_image_alt')) && empty($this->params->get('logout_image_alt_empty')) ? false : $this->params->get('logout_image_alt')]); ?>
+		<?php echo HTMLHelper::_('image', $this->params->get('logout_image'), empty($this->params->get('logout_image_alt')) && empty($this->params->get('logout_image_alt_empty')) ? false : $this->params->get('logout_image_alt'), ['class' => 'com-users-logout__image thumbnail float-end logout-image']); ?>
 	<?php endif; ?>
 
 	<?php if (($this->params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?>

installation/language/af-ZA/joomla.ini

@@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Kon nie lêer %1$s na
 JLIB_INSTALLER_INSTALL="Installeer"
 JLIB_INSTALLER_NOT_ERROR="As die fout verband hou met die installering van TinyMCE-taallêers, het dit geen invloed op die installering van die taal(e) nie. Sommige taalpakkette wat voor Joomla 3.2.0 geskep is, kan probeer om aparte TinyMCE-taallêers te installeer. Aangesien dit nou in die kern is, hoef dit nie meer geïnstalleer te word nie."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Kan nie 'n inhoudstaal skep vir %s taal %s."
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Die PHP allow_url_fopen stelling is gedeaktiveer. Hierdie stelling moet geaktiveer wees vir die opdateerder om te werk."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Opdateer: ::Collection:: Kon nie %s oopmaak nie"
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Opdateer: :Collection: Kon nie verdeel %s nie"
 JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Opdatering: kon die opdateringswerf nie oopmaak nie #%d \"%s\", URL: %s."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kon nie aan die databasis koppel nie <br>joomla.library: %1$s - %2$s."
 ; Strings for the language debugger

installation/language/af-ZA/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Afrikaans (Suid-Afrika)</name>
-	<version>4.1.1</version>
-	<creationDate>March 2022</creationDate>
+	<version>4.1.4</version>
+	<creationDate>May 2022</creationDate>
 	<author>Joomla! Projek</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/ar-AA/joomla.ini

@@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: فشل عملية ن
 JLIB_INSTALLER_INSTALL="تثبيت"
 JLIB_INSTALLER_NOT_ERROR="إذا كان الخطأ في التنصيب مرتبط في حزمة اللغة للمحرر TinyMCE فلا تقلق فليس له أي تأثير على عملية التنصيب للغات التي تريدها. بعض حزم اللغات تم إنشاؤها قبل اصدار جوملا! 3.2 و التي تحتوي على حزمة اللغة منفصلة. كما يتم تضمين هذه الآن في الأساس لهذا لم تعد تحتاج إلى تنصيبها."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="تعذر إنشاء لغة المحتوى %s للغة:%s."
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="الدالة allow_url_fopen غير مفعلة. يجب تفعيلها كي تتم عملية التحديث."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: غير قادر على فتح %s"
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: لا يمكن تحليل %s"
 JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="تحديث: تعذر فتح موقع التحديث #%d \"%s\", URL: %s."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: تعذر الاتصال بقاعدة البيانات <br />joomla.library: %1$s - %2$s"
 ; Strings for the language debugger

installation/language/ar-AA/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Arabic (اللغة العربية)</name>
-	<version>4.1.1</version>
-	<creationDate>March 2022</creationDate>
+	<version>4.1.4</version>
+	<creationDate>May 2022</creationDate>
 	<author>Dr. Ashraf Damra</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/bg-BG/joomla.ini

@@ -233,6 +233,9 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Инсталиране: Неу
 JLIB_INSTALLER_INSTALL="Инсталиране"
 JLIB_INSTALLER_NOT_ERROR="Ако грешката е свързана с инсталирането на езиковите файлове на TinyMCE, то тя няма ефект върху инсталирането на езика(езиците). Някои езикови пакет, създадени преди Joomla 3.2.0 може да се опитват да инсталират отделни TinyMCE езикови файлове. Тъй като тези вече са част от ядрото, няма нужда да бъдат инсталирани отделно."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Не може да създаде език за съдържание за %s език: %s."
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP настройката allow_url_fopen е забранена. За да работи автоматичното, тази настройка трябва да е включена."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Обновяване: Колекция: Не може да бъде отворено %s"
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Обновяване: :Колекция: Не може да бъде парснато %s"
 JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Обновяване: Не може да бъде отворен сайтът с обновления #%d \"%s\", URL: %s."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Не може да бъде осъществена връзка с базата данни <br>joomla.library: %1$s - %2$s."
 ; Strings for the language debugger

installation/language/bg-BG/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Bulgarian (bg-BG)</name>
-	<version>4.1.1</version>
-	<creationDate>March 2022</creationDate>
+	<version>4.1.4</version>
+	<creationDate>May 2022</creationDate>
 	<author>Joomla! Bulgaria</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>