Merge branch '4.3-dev' into 4.4-dev

sanderpotjer · Sep 18, 2023 · aa7c5bf · aa7c5bf
2 parents ec426c5 + 1538795
commit aa7c5bf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,11 +1,3 @@
-# Custom Fields
-administrator/components/com_fields/*  @laoneo
-components/com_fields/*  @laoneo
-plugins/content/fields/*  @laoneo
-plugins/editors-xtd/fields/*  @laoneo
-plugins/fields/*  @laoneo
-plugins/systems/fields/*  @laoneo
-
 # Smart Search
 administrator/components/com_finder/*  @hackwar
 components/com_finder/*  @hackwar
@@ -14,10 +6,10 @@ plugins/content/finder/*  @hackwar
 plugins/finder/*  @hackwar
 
 # Release Tools
-build.xml  @wilsonge
-build/build.php  @rdeutz @wilsonge
-build/bump.php  @rdeutz @wilsonge
-build/deleted_file_check.php  @rdeutz @wilsonge
+build.xml  @fancyFranci
+build/build.php  @rdeutz
+build/bump.php  @rdeutz
+build/deleted_file_check.php  @rdeutz
 
 # Core/Extension Install/Update Tools
 administrator/components/com_joomlaupdate/*  @rdeutz @zero-24

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -635,7 +635,13 @@ protected function updateManifestCaches()
             if (!$installer->refreshManifestCache($extension->extension_id)) {
                 $this->collectError(
                     __METHOD__,
-                    new \Exception(Text::sprintf('FILES_JOOMLA_ERROR_MANIFEST', $extension->type, $extension->element, $extension->name, $extension->client_id))
+                    new \Exception(sprintf(
+                        'Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)',
+                        $extension->type,
+                        $extension->element,
+                        $extension->name,
+                        $extension->client_id
+                    ))
                 );
             }
         }
@@ -8083,7 +8089,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
                     if (File::delete(JPATH_ROOT . $file)) {
                         $status['files_deleted'][] = $file;
                     } else {
-                        $status['files_errors'][] = Text::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $file);
+                        $status['files_errors'][] = sprintf('Error on deleting file or folder %s', $file);
                     }
                 }
             }
@@ -8099,7 +8105,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
                     if (Folder::delete(JPATH_ROOT . $folder)) {
                         $status['folders_deleted'][] = $folder;
                     } else {
-                        $status['folders_errors'][] = Text::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $folder);
+                        $status['folders_errors'][] = sprintf('Error on deleting file or folder %s', $folder);
                     }
                 }
             }

diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss
@@ -50,6 +50,7 @@
     position: relative;
     flex: 1;
     min-width: 210px;
+    max-width: 100%;
 
     + div {
       width: 100%;

diff --git a/language/en-GB/files_joomla.sys.ini b/language/en-GB/files_joomla.sys.ini
@@ -4,6 +4,8 @@
 ; Note : All ini files need to be saved as UTF-8
 
 FILES_JOOMLA="Joomla CMS"
+FILES_JOOMLA_XML_DESCRIPTION="Joomla! 4 Content Management System."
+
+; All the following strings are deprecated and will be removed with 6.0
 FILES_JOOMLA_ERROR_FILE_FOLDER="Error on deleting file or folder %s"
 FILES_JOOMLA_ERROR_MANIFEST="Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)"
-FILES_JOOMLA_XML_DESCRIPTION="Joomla! 4 Content Management System."
diff --git a/libraries/src/Console/UpdateCoreCommand.php b/libraries/src/Console/UpdateCoreCommand.php
@@ -10,6 +10,7 @@
 namespace Joomla\CMS\Console;
 
 use Joomla\Application\Cli\CliInput;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;