Merge remote-tracking branch 'upstream/4.4-dev' into 5.0-dev

# Conflicts:
#	administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

Author: HLeithner

.github/CONTRIBUTING.md

@@ -14,12 +14,12 @@ If it is a PR, include what the issue is, what the PR is addressing, testing ins
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-PRs should usually be made to the `4.2-dev` branch as this contains the most recent version of the code.
+PRs should usually be made to the `4.3-dev` branch as this contains the most recent version of the code.
 There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
 | 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will now only include security patches. |
-| 4.2-dev | Branch for the current minor Joomla version.|
-| 4.3-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.2-dev will be applied to this branch as well. |
-| 5.0-dev | Branch for the next major Joomla version. |
+| 4.3-dev | Branch for the current minor Joomla version.|
+| 4.4-dev | Branch for the next minor Joomla version. Commits to 4.3-dev will be applied to this branch as well. |
+| 5.0-dev | Branch for the next major Joomla version. New features go into this branch. |

administrator/components/com_content/forms/filter_featured.xml

@@ -16,7 +16,7 @@
 			label="JOPTION_SELECT_STAGE"
 			class="js-select-submit-on-change"
 			activeonly="true"
-			extension="com_content"
+			extension="com_content.article"
 			>
 			<option value="">JOPTION_SELECT_STAGE</option>
 		</field>

administrator/components/com_fields/src/Model/GroupModel.php

@@ -240,29 +240,30 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 
         $parts = FieldsHelper::extract($this->state->get('filter.context'));
 
+        // If we don't have a valid context then return early
+        if (!$parts) {
+            return;
+        }
+
         // Extract the component name
         $component = $parts[0];
 
-        // Extract the optional section name
-        $section = (count($parts) > 1) ? $parts[1] : null;
+        // Extract the section name
+        $section = $parts[1];
 
-        if ($parts) {
-            // Set the access control rules field component value.
-            $form->setFieldAttribute('rules', 'component', $component);
-        }
+        // Set the access control rules field component value.
+        $form->setFieldAttribute('rules', 'component', $component);
 
-        if ($section !== null) {
-            // Looking first in the component models/forms folder
-            $path = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');
+        // Looking first in the component models/forms folder
+        $path = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');
 
-            if (file_exists($path)) {
-                $lang = Factory::getLanguage();
-                $lang->load($component, JPATH_BASE);
-                $lang->load($component, JPATH_BASE . '/components/' . $component);
+        if (file_exists($path)) {
+            $lang = Factory::getLanguage();
+            $lang->load($component, JPATH_BASE);
+            $lang->load($component, JPATH_BASE . '/components/' . $component);
 
-                if (!$form->loadFile($path, false)) {
-                    throw new \Exception(Text::_('JERROR_LOADFILE_FAILED'));
-                }
+            if (!$form->loadFile($path, false)) {
+                throw new \Exception(Text::_('JERROR_LOADFILE_FAILED'));
             }
         }
     }

administrator/components/com_fields/tmpl/fields/default.php

@@ -198,7 +198,7 @@
                     <?php // load the pagination. ?>
                     <?php echo $this->pagination->getListFooter(); ?>
 
-                    <?php //Load the batch processing form. ?>
+                    <?php // Load the batch processing form. ?>
                     <?php
                     if (
                         $user->authorise('core.create', $component)

administrator/components/com_fields/tmpl/groups/default.php

@@ -166,7 +166,7 @@
                     <?php // load the pagination. ?>
                     <?php echo $this->pagination->getListFooter(); ?>
 
-                    <?php //Load the batch processing form. ?>
+                    <?php // Load the batch processing form. ?>
                     <?php
                     if (
                         $user->authorise('core.create', $component)

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -494,8 +494,11 @@ protected function downloadPackage($url, $target)
             return false;
         }
 
+        // Fix Indirect Modification of Overloaded Property
+        $body = $result->body;
+
         // Write the file to disk
-        $result = File::write($target, $result->body);
+        $result = File::write($target, $body);
 
         if (!$result) {
             return false;

administrator/components/com_templates/src/Model/TemplateModel.php

@@ -959,7 +959,7 @@ public function save($data)
         $data['source'] = str_replace(["\r\n", "\r"], "\n", $data['source']);
 
         // If the asset file for the template ensure we have valid template so we don't instantly destroy it
-        if ($fileName === '/joomla.asset.json' && json_decode($data['source']) === null) {
+        if (str_ends_with($fileName, '/joomla.asset.json') && json_decode($data['source']) === null) {
             $this->setError(Text::_('COM_TEMPLATES_ERROR_ASSET_FILE_INVALID_JSON'));
 
             return false;

administrator/modules/mod_guidedtours/tmpl/default.php

@@ -25,16 +25,16 @@
     ->getWebAssetManager()
     ->useScript('bootstrap.dropdown');
 
-$lang = $app->getLanguage();
-
-$extension = $app->getInput()->get('option');
-
-$listTours = [];
-$allTours = [];
+$lang       = $app->getLanguage();
+$extension  = $app->getInput()->get('option');
+$listTours  = [];
+$allTours   = [];
+$toursCount = $params->get('tourscount', 7);
 
 foreach ($tours as $tour) :
-    if (count(array_intersect(['*', $extension], $tour->extensions))) :
+    if ($toursCount > 0 && count(array_intersect(['*', $extension], $tour->extensions))) :
         $listTours[] = $tour;
+        $toursCount--;
     endif;
 
     $uri = new Uri($tour->url);
@@ -64,10 +64,7 @@
         <span class="icon-angle-down" aria-hidden="true"></span>
     </button>
     <div class="dropdown-menu dropdown-menu-end">
-        <?php foreach ($listTours as $i => $tour) : ?>
-            <?php if ($i >= $params->get('tourscount', 7)) : ?>
-                <?php break; ?>
-            <?php endif; ?>
+        <?php foreach ($listTours as $tour) : ?>
             <button type="button" class="button-start-guidedtour dropdown-item" data-id="<?php echo $tour->id ?>">
                 <span class="icon-map-signs" aria-hidden="true"></span>
                 <?php echo $tour->title; ?>

administrator/templates/atum/component.php

@@ -19,17 +19,21 @@
 // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
 
+$linkColor = $this->params->get('link-color', '#2a69b8');
+list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x");
+
 // Enable assets
 $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
     ->useStyle('template.active.language')
     ->useStyle('template.user')
     ->addInlineStyle(':root {
 		--hue: ' . $matches[1] . ';
-		--template-bg-light: ' . $this->params->get('bg-light', '--template-bg-light') . ';
-		--template-text-dark: ' . $this->params->get('text-dark', '--template-text-dark') . ';
-		--template-text-light: ' . $this->params->get('text-light', '--template-text-light') . ';
-		--template-link-color: ' . $this->params->get('link-color', '--template-link-color') . ';
-		--template-special-color: ' . $this->params->get('special-color', '--template-special-color') . ';
+		--template-bg-light: ' . $this->params->get('bg-light', 'var(--template-bg-light)') . ';
+		--template-text-dark: ' . $this->params->get('text-dark', 'var(--template-text-dark)') . ';
+		--template-text-light: ' . $this->params->get('text-light', 'var(--template-text-light)') . ';
+		--link-color: ' . $linkColor . ';
+        --link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
+		--template-special-color: ' . $this->params->get('special-color', 'var(--template-special-color)') . ';
 	}');
 
 // No template.js for modals

administrator/templates/atum/error_full.php

@@ -54,6 +54,9 @@
     // Get the hue value
     preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
 
+    $linkColor = $this->params->get('link-color', '#2a69b8');
+    list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x");
+
     // Enable assets
     $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
         ->useStyle('template.active.language')
@@ -63,7 +66,8 @@
 			--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
 			--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
 			--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
-			--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
+			--link-color: ' . $linkColor . ';
+    		--link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
 			--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
 		}');