Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev

.gitignore

@@ -7,6 +7,7 @@
 .vscode
 .docker
 /docker-compose.yml
+/nbproject
 
 # Local System Files (i.e. cache, logs, etc.)
 /administrator/cache

README.md

@@ -3,9 +3,9 @@ Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cm
 
 Build Status
 ---------------------
-| Drone-CI | AppVeyor |
-| ------------- | ------------- |
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.0-dev)](https://ci.joomla.org/joomla/joomla-cms)  | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.0-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms)  |
+| Drone-CI      | AppVeyor      | PHP           |  Node         | npm           |
+| ------------- | ------------- | ------------- | ------------- | ------------- |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.0-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/) |
 
 Overview
 ---------------------

administrator/components/com_admin/script.php

@@ -57,7 +57,7 @@ public function preflight($action, $installer)
 			{
 				$manifestValues = json_decode($installer->extension->manifest_cache, true);
 
-				if ((array_key_exists('version', $manifestValues)))
+				if (array_key_exists('version', $manifestValues))
 				{
 					$this->fromVersion = $manifestValues['version'];
 
@@ -5045,6 +5045,17 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/templates/cassiopeia/html/layouts/chromes/cardGrey.php',
 			'/templates/cassiopeia/html/layouts/chromes/default.php',
 			'/templates/cassiopeia/scss/vendor/bootstrap/_card.scss',
+			// Joomla 4.0 Beta 7
+			'/media/vendor/skipto/js/dropMenu.js',
+			'/media/vendor/skipto/css/SkipTo.css',
+			// Joomla 4.0 Beta 8
+			'/administrator/components/com_admin/forms/profile.xml',
+			'/administrator/components/com_admin/postinstall/htaccess.php',
+			'/administrator/components/com_admin/postinstall/updatedefaultsettings.php',
+			'/administrator/components/com_admin/src/Controller/ProfileController.php',
+			'/administrator/components/com_admin/src/Model/ProfileModel.php',
+			'/administrator/components/com_admin/src/View/Profile/HtmlView.php',
+			'/administrator/components/com_admin/tmpl/profile/edit.php',
 		);
 
 		$folders = array(
@@ -6233,10 +6244,11 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/libraries/vendor/joomla/controller',
 			// Joomla 4.0 Beta 5
 			'/plugins/content/imagelazyload',
-			// Joomla 4.0 Beta 6
-			'/media/vendor/skipto/js/skipTo.js',
-			'/media/vendor/skipto/js/dropMenu.js',
-			'/media/vendor/skipto/css/SkipTo.css'
+			// Joomla 4.0 Beta 7
+			'/media/vendor/skipto/css',
+			// Joomla 4.0 Beta 8
+			'/administrator/components/com_admin/src/View/Profile',
+			'/administrator/components/com_admin/tmpl/profile',
 		);
 
 		$status['files_checked'] = $files;
@@ -7084,6 +7096,11 @@ private function convertBlogLayouts()
 				// Convert to the according CSS class depending on order = "down" or "across".
 				$layout = ($order === 0) ? 'masonry-' : 'columns-';
 
+				if (!isset($params['blog_class']))
+				{
+					$params['blog_class'] = '';
+				}
+
 				if (strpos($params['blog_class'], $layout) === false)
 				{
 					$params['blog_class'] .= ' ' . $layout . $nColumns;
@@ -7105,7 +7122,7 @@ private function convertBlogLayouts()
 		// Update global parameters for com_content.
 		$nColumns = $contentParams->get('num_columns');
 
-		if ($nColumns !== null || true)
+		if ($nColumns !== null)
 		{
 			$nColumns = (int) $nColumns;
 			$order  = (int) $contentParams->get('multi_column_order', '0');
@@ -7153,7 +7170,7 @@ private function convertBlogLayouts()
 	 *
 	 * @return  void
 	 *
-	 * @since   4.0.0
+	 * @since   3.10.0
 	 */
 	protected function fixFilenameCasing()
 	{

administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-02-28.sql

@@ -0,0 +1,8 @@
+DELETE FROM `#__postinstall_messages`
+ WHERE `title_key`
+    IN ('COM_CPANEL_MSG_EACCELERATOR_TITLE',
+        'COM_CPANEL_MSG_HTACCESS_TITLE',
+        'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE',
+        'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE',
+        'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_TITLE',
+        'TPL_HATHOR_MESSAGE_POSTINSTALL_TITLE');

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-02-28.sql

@@ -0,0 +1,8 @@
+DELETE FROM "#__postinstall_messages"
+ WHERE "title_key"
+    IN ('COM_CPANEL_MSG_EACCELERATOR_TITLE',
+        'COM_CPANEL_MSG_HTACCESS_TITLE',
+        'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE',
+        'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE',
+        'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_TITLE',
+        'TPL_HATHOR_MESSAGE_POSTINSTALL_TITLE');