Merge branch '4.1-dev' into patch-46

Author: bembelimen

.drone.yml

@@ -23,7 +23,7 @@ steps:
       - echo $(date)
 
   - name: npm
-    image: node:14-alpine
+    image: node:16-alpine
     depends_on: [ phpcs ]
     commands:
       - npm ci --unsafe-perm
@@ -419,6 +419,6 @@ steps:
 
 ---
 kind: signature
-hmac: 15e1abb49597a83c250c8785948aa9fa0c6d93ec88b03e45c30d8050b338ea5d
+hmac: c34b8c98013a4c7f604f5c650875d03f4291e4fa42ba9ceb730993172d965aff
 
 ...

README.md

@@ -5,7 +5,7 @@ Build Status
 ---------------------
 | Drone-CI      | AppVeyor      | PHP           |  Node         | npm           |
 | ------------- | ------------- | ------------- | ------------- | ------------- |
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V12.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v6.13.4-green)](https://nodejs.org/en/) |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V7.2.5-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V16.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v8.6.0-green)](https://nodejs.org/en/) |
 
 Overview
 ---------------------

administrator/components/com_menus/src/Model/ItemModel.php

@@ -1433,8 +1433,8 @@ public function rebuild()
 	 */
 	public function save($data)
 	{
-		$pk         = isset($data['id']) ? $data['id'] : (int) $this->getState('item.id');
-		$isNew      = true;
+		$pk      = isset($data['id']) ? $data['id'] : (int) $this->getState('item.id');
+		$isNew   = true;
 		$db      = $this->getDbo();
 		$query   = $db->getQuery(true);
 		$table   = $this->getTable();
@@ -1512,13 +1512,24 @@ public function save($data)
 			return false;
 		}
 
-		// Alter the title & alias for save as copy.  Also, unset the home record.
-		if (!$isNew && $data['id'] == 0)
+		// Alter the title & alias for save2copy when required. Also, unset the home record.
+		if (Factory::getApplication()->input->get('task') === 'save2copy' && $data['id'] === 0)
 		{
-			list($title, $alias) = $this->generateNewTitle($table->parent_id, $table->alias, $table->title);
+			$origTable = $this->getTable();
+			$origTable->load($this->getState('item.id'));
+
+			if ($table->title === $origTable->title)
+			{
+				list($title, $alias) = $this->generateNewTitle($table->parent_id, $table->alias, $table->title);
+				$table->title = $title;
+				$table->alias = $alias;
+			}
+
+			if ($table->alias === $origTable->alias)
+			{
+				$table->alias = '';
+			}
 
-			$table->title     = $title;
-			$table->alias     = $alias;
 			$table->published = 0;
 			$table->home      = 0;
 		}

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)) : ?>