Merge branch '4.1-dev' into 4.2-dev

# Conflicts: # administrator/components/com_contact/src/Extension/ContactComponent.php # administrator/components/com_contact/src/Service/HTML/Icon.php
joomla · May 15, 2022 · ee81859 · ee81859
2 parents 45d346f + ee1fa78
commit ee81859
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 45 deletions.
diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php
@@ -115,7 +115,7 @@ class ContentComponent extends MVCComponent implements
 	public function boot(ContainerInterface $container)
 	{
 		$this->getRegistry()->register('contentadministrator', new AdministratorService);
-		$this->getRegistry()->register('contenticon', new Icon($container->get(SiteApplication::class)));
+		$this->getRegistry()->register('contenticon', new Icon);
 
 		// The layout joomla.content.icons does need a general icon service
 		$this->getRegistry()->register('icon', $this->getRegistry()->getService('contenticon'));

diff --git a/administrator/components/com_content/src/Service/HTML/Icon.php b/administrator/components/com_content/src/Service/HTML/Icon.php
@@ -29,27 +29,6 @@
  */
 class Icon
 {
-	/**
-	 * The application
-	 *
-	 * @var    CMSApplication
-	 *
-	 * @since  4.0.0
-	 */
-	private $application;
-
-	/**
-	 * Service constructor
-	 *
-	 * @param   CMSApplication  $application  The application
-	 *
-	 * @since   4.0.0
-	 */
-	public function __construct(CMSApplication $application)
-	{
-		$this->application = $application;
-	}
-
 	/**
 	 * Method to generate a link to the create item page for the given category
 	 *
@@ -115,13 +94,13 @@ public function edit($article, $params, $attribs = array(), $legacy = false)
 		// Ignore if in a popup window.
 		if ($params && $params->get('popup'))
 		{
-			return;
+			return '';
 		}
 
 		// Ignore if the state is negative (trashed).
 		if (!in_array($article->state, [Workflow::CONDITION_UNPUBLISHED, Workflow::CONDITION_PUBLISHED]))
 		{
-			return;
+			return '';
 		}
 
 		// Show checked_out icon if the article is checked out by a different user

diff --git a/administrator/components/com_scheduler/forms/filter_tasks.xml b/administrator/components/com_scheduler/forms/filter_tasks.xml
@@ -40,7 +40,6 @@
 	</fields>
 
 	<fields name="list">
-		<!-- @todo: Add options for execution date(s) -->
 		<field
 			name="fullordering"
 			type="list"
@@ -58,6 +57,8 @@
 			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
 			<option value="j.type_title ASC">COM_SCHEDULER_TASK_TYPE_ASC</option>
 			<option value="j.type_title DESC">COM_SCHEDULER_TASK_TYPE_DESC</option>
+			<option value="a.last_execution ASC">COM_SCHEDULER_LAST_RUN_ASC</option>
+			<option value="a.last_execution DESC">COM_SCHEDULER_LAST_RUN_DESC</option>
 			<option value="a.priority ASC">COM_SCHEDULER_TASK_PRIORITY_ASC</option>
 			<option value="a.priority DESC">COM_SCHEDULER_TASK_PRIORITY_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>

diff --git a/administrator/components/com_scheduler/src/Scheduler/Scheduler.php b/administrator/components/com_scheduler/src/Scheduler/Scheduler.php
@@ -246,7 +246,7 @@ public function getTask(array $options = []): ?Task
 
 		if (!isset($model))
 		{
-			throw new \RuntimeException('JLIB_APPLICATION_ERROR_MODEL_CREATE');
+			throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_MODEL_CREATE'));
 		}
 
 		$task = $model->getTask($options);
@@ -327,7 +327,7 @@ public function fetchTaskRecords(array $filters, array $listConfig): array
 
 		if (!$model)
 		{
-			throw new \RuntimeException('JLIB_APPLICATION_ERROR_MODEL_CREATE');
+			throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_MODEL_CREATE'));
 		}
 
 		$model->setState('list.select', 'a.*');

diff --git a/administrator/components/com_scheduler/tmpl/tasks/default.php b/administrator/components/com_scheduler/tmpl/tasks/default.php
@@ -130,7 +130,7 @@ class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
 
 					<!-- Last runs -->
 					<th scope="col" class="d-none d-lg-table-cell">
-						<?php echo Text::_('COM_SCHEDULER_LAST_RUN_DATE'); ?>
+						<?php echo HTMLHelper::_('searchtools.sort', 'COM_SCHEDULER_LAST_RUN_DATE', 'a.last_execution', $listDirn, $listOrder) ?>
 					</th>
 
 					<!-- Test task -->

diff --git a/administrator/language/en-GB/com_scheduler.ini b/administrator/language/en-GB/com_scheduler.ini
@@ -77,7 +77,9 @@ COM_SCHEDULER_LABEL_TASK_PRIORITY_LOW="Low"
 COM_SCHEDULER_LABEL_TASK_PRIORITY_NORMAL="Normal"
 COM_SCHEDULER_LABEL_TIMES_EXEC="Times Executed"
 COM_SCHEDULER_LABEL_TIMES_FAIL="Times Failed"
+COM_SCHEDULER_LAST_RUN_ASC="Last Run ascending"
 COM_SCHEDULER_LAST_RUN_DATE="Last Run Date"
+COM_SCHEDULER_LAST_RUN_DESC="Last Run descending"
 COM_SCHEDULER_MANAGER_TASKS="Scheduled Tasks"
 COM_SCHEDULER_MANAGER_TASK_EDIT="Edit Task"
 COM_SCHEDULER_MANAGER_TASK_NEW="New Task"

diff --git a/administrator/language/en-GB/plg_sampledata_blog.ini b/administrator/language/en-GB/plg_sampledata_blog.ini
@@ -30,7 +30,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p><p>This blog is installed with the Cassiopeia template.</p><p>You can edit the options by selecting the Working on Your Site, Template Settings link in the menu which is visible when you log in.</p><p>For example you can change the site background colour, highlights colour, site title, site description and title font used.</p><p>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_TITLE="Your Template"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_FULLTEXT="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est "
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_FULLTEXT="<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_INTROTEXT="<p><strong>Millions of Websites are built on Joomla!</strong></p><p>Learn more about beautiful blog presentation.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_6_TITLE="Millions"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_FULLTEXT="<p>Uurnip greens yarrow ricebean rutabaga endive cauliflower sea lettuce kohlrabi amaranth water spinach avocado daikon napa cabbage asparagus winter purslane kale. Celery potato scallion desert raisin horseradish spinach carrot soko. Lotus root water spinach fennel kombu maize bamboo shoot green bean swiss chard seakale pumpkin onion chickpea gram corn pea. Brussels sprout coriander water chestnut gourd swiss chard wakame kohlrabi beetroot carrot watercress. Corn amaranth salsify bunya nuts nori azuki bean chickweed potato bell pepper artichoke.</p> "

diff --git a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
@@ -152,7 +152,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
 
 				if ($params->get('show_categories') == 2)
 				{
-					$tmp['ajaxurl'] = 'index.php?option=com_categories&amp;task=categories.getQuickiconContent&amp;format=json';
+					$tmp['ajaxurl'] = 'index.php?option=com_categories&amp;task=categories.getQuickiconContent&amp;extension=content&amp;format=json';
 				}
 
 				$this->buttons[$key][] = $tmp;

diff --git a/build/media_source/legacy/js/treeselectmenu.es5.js b/build/media_source/legacy/js/treeselectmenu.es5.js
@@ -90,14 +90,14 @@ jQuery(function($)
 	$('#treeExpandAll').click(function()
 	{
 		$('ul.treeselect ul.treeselect-sub').show();
-		$('ul.treeselect i.treeselect-toggle').removeClass('icon-chevron-right').addClass('icon-chevron-down');
+		$('ul.treeselect span.treeselect-toggle').removeClass('icon-chevron-right').addClass('icon-chevron-down');
 	});
 
 	// Unchecks all checkboxes the tree
 	$('#treeCollapseAll').click(function()
 	{
 		$('ul.treeselect ul.treeselect-sub').hide();
-		$('ul.treeselect i.treeselect-toggle').removeClass('icon-chevron-down').addClass('icon-chevron-right');
+		$('ul.treeselect span.treeselect-toggle').removeClass('icon-chevron-down').addClass('icon-chevron-right');
 	});
 	// Take care of children check/uncheck all
 	$('a.checkall').click(function()

diff --git a/build/media_source/system/js/draggable.es6.js b/build/media_source/system/js/draggable.es6.js
@@ -43,6 +43,7 @@ if (container) {
   // Get the form data
   formData = new FormData(form);
   formData.delete('task');
+  formData.delete('order[]');
 
   // IOS 10 BUG
   document.addEventListener('touchstart', () => {}, false);

diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
@@ -6,7 +6,7 @@
   z-index: $zindex-toolbar;
   width: auto;
   min-height: 43px;
-  padding: 10px 0;
+  padding: .25rem;
   color: #495057; //#0c192e;
   background: $white;
   box-shadow: -3px -2px 22px #ddd;

diff --git a/components/com_users/tmpl/login/logout.xml b/components/com_users/tmpl/login/logout.xml
@@ -32,7 +32,7 @@
 				edit="true"
 				clear="true"
 				>
-				<option value="">JDEFAULT</option>
+				<option value="">JOPTION_SELECT_MENU</option>
 			</field>
 		</fieldset>
 	</fields>

diff --git a/libraries/src/Service/Provider/Session.php b/libraries/src/Service/Provider/Session.php
@@ -87,7 +87,7 @@ function (Container $container)
 				}
 
 				return $this->buildSession(
-					new JoomlaStorage($app->input, $handler),
+					new JoomlaStorage($app->input, $handler, $options),
 					$app,
 					$container->get(DispatcherInterface::class),
 					$options
@@ -176,7 +176,7 @@ function (Container $container)
 				}
 
 				return $this->buildSession(
-					new JoomlaStorage($app->input, $handler),
+					new JoomlaStorage($app->input, $handler, $options),
 					$app,
 					$container->get(DispatcherInterface::class),
 					$options

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
@@ -17,7 +17,7 @@
 
 ?>
 <nav class="mod-breadcrumbs__wrapper" aria-label="<?php echo htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8'); ?>">
-	<ol itemscope itemtype="https://schema.org/BreadcrumbList" class="mod-breadcrumbs breadcrumb px-3 py-2">
+	<ol class="mod-breadcrumbs breadcrumb px-3 py-2">
 		<?php if ($params->get('showHere', 1)) : ?>
 			<li class="mod-breadcrumbs__here float-start">
 				<?php echo Text::_('MOD_BREADCRUMBS_HERE'); ?>&#160;
@@ -78,14 +78,30 @@
 
 	foreach ($list as $key => $item)
 	{
-		$data['itemListElement'][] = [
-				'@type'    => 'ListItem',
-				'position' => $key + 1,
-				'item'     => [
-						'@id'  => $item->link ? Route::_($item->link, true, Route::TLS_IGNORE, true) : Route::_(Uri::getInstance()),
-						'name' => $item->name
-				]
-		];
+		// Only add item to JSON if it has a valid link, otherwise skip it.
+		if (!empty($item->link))
+		{
+			$data['itemListElement'][] = [
+					'@type'    => 'ListItem',
+					'position' => $key + 1,
+					'item'     => [
+							'@id'  => Route::_($item->link, true, Route::TLS_IGNORE, true),
+							'name' => $item->name,
+					],
+			];
+		}
+		elseif ($key === $last_item_key)
+		{
+			// Add the last item (current page) to JSON, but without a link.
+			// Google accepts items without a URL only as the current page.
+			$data['itemListElement'][] = [
+					'@type'    => 'ListItem',
+					'position' => $key + 1,
+					'item'     => [
+							'name' => $item->name,
+					],
+			];
+		}
 	}
 
 	/** @var WebAssetManager $wa */