Merge branch '4.3-dev' into 4.4-dev

This commit is contained in:
Allon Moritz 2023-09-18 13:20:31 +02:00
commit aa7c5bf768
No known key found for this signature in database
GPG Key ID: 6486E0BC67E6DDF4
5 changed files with 18 additions and 16 deletions

16
.github/CODEOWNERS vendored
View File

@ -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

View File

@ -635,7 +635,13 @@ class JoomlaInstallerScript
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 @@ class JoomlaInstallerScript
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 @@ class JoomlaInstallerScript
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);
}
}
}

View File

@ -50,6 +50,7 @@
position: relative;
flex: 1;
min-width: 210px;
max-width: 100%;
+ div {
width: 100%;

View File

@ -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."

View File

@ -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;