Click to expand the diff!
```diff
diff --git a/administrator/language/en-GB/com_media.ini b/administrator/language/en-GB/com_media.ini
index 598ac5a0c1a4..0fd7852dc7cb 100644
--- a/administrator/language/en-GB/com_media.ini
+++ b/administrator/language/en-GB/com_media.ini
@@ -26,14 +26,17 @@ COM_MEDIA_EDIT="Media Edit"
COM_MEDIA_ERROR="An error occurred."
COM_MEDIA_ERROR_ACCOUNT_NOT_FOUND="The account was not found"
COM_MEDIA_ERROR_ACCOUNT_NOT_SET="Account was not set."
+COM_MEDIA_ERROR_MAKESAFE="Could not make the file name safe. If it contains non ASCII chars please ensure you have the INTL and ICONV PHP Extensions installed."
COM_MEDIA_ERROR_MEDIA_PROVIDER_NOT_FOUND="Media Provider not found."
-COM_MEDIA_ERROR_NO_ADAPTER_FOUND="No adapter found."
-COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE="No content available!"
-COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one filesystem plugin."
+COM_MEDIA_ERROR_MISSING_DIR="One or more of the directories defined in the FileSystem - Local plugin does not exist."
COM_MEDIA_ERROR_NOT_AUTHENTICATED="You are not authenticated. Please login."
COM_MEDIA_ERROR_NOT_AUTHORIZED="You are not authorised"
COM_MEDIA_ERROR_NOT_FOUND="File or Folder not found"
+COM_MEDIA_ERROR_NO_ADAPTER_FOUND="No adapter found."
+COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE="No content available!"
+COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one filesystem plugin."
COM_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload. You can change the limits for your site in the component options."
+COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media"
COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to attempt to verify files. Try disabling this if you get invalid mime type errors."
COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."
@@ -46,10 +49,10 @@ COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_DESC="Document extensions (file types)
COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_LABEL="Legal Document Extensions (File Types)"
COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers."
COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL="Legal Image Extensions (File Types)"
-COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_DESC="Video extensions (file types) you are allowed to upload (comma separated). These are used to check for valid video headers."
-COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_LABEL="Legal Video Extensions (File Types)"
COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC="A comma separated list of legal MIME types to upload."
COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL="Legal MIME Types"
+COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_DESC="Video extensions (file types) you are allowed to upload (comma separated). These are used to check for valid video headers."
+COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_LABEL="Legal Video Extensions (File Types)"
COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC="Use zero for no limit. Note: your server has a maximum limit."
COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL="Maximum Size (in MB)"
COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC="Enter the path to the files folder relative to the root of your webspace. Warning! Changing to another path than the default 'images' may break your links. Note: Do not start the path with a slash!"
@@ -60,12 +63,11 @@ COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager u
COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_DESC="Restrict uploads for lower than manager users to files in the list."
COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_LABEL="Allowed Extensions"
COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
-COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media"
COM_MEDIA_FILE="File"
COM_MEDIA_FILE_EXISTS_AND_OVERRIDE="%s already exists. Do you want to replace it?"
COM_MEDIA_FOLDER="Folder"
-COM_MEDIA_FOLDER_NAME="Folder Name"
COM_MEDIA_FOLDERS="Media Folders"
+COM_MEDIA_FOLDER_NAME="Folder Name"
COM_MEDIA_INCREASE_GRID="Increase grid size"
COM_MEDIA_MEDIA_DATE_CREATED="Date Created"
COM_MEDIA_MEDIA_DATE_MODIFIED="Date Modified"
@@ -80,7 +82,6 @@ COM_MEDIA_OPEN_ITEM_ACTIONS="Open item actions"
COM_MEDIA_PLEASE_SELECT_ITEM="Please select item."
COM_MEDIA_RENAME="Rename"
COM_MEDIA_RENAME_ERROR="Error renaming item."
-COM_MEDIA_ERROR_MAKESAFE="Could not make the file name safe. If it contains non ASCII chars please ensure you have the INTL and ICONV PHP Extensions installed."
COM_MEDIA_RENAME_SUCCESS="Item renamed."
COM_MEDIA_RESET="Reset"
COM_MEDIA_SEARCH="Search"
diff --git a/plugins/filesystem/local/src/Adapter/LocalAdapter.php b/plugins/filesystem/local/src/Adapter/LocalAdapter.php
index df8c86bcc9f0..d17498c609fa 100644
--- a/plugins/filesystem/local/src/Adapter/LocalAdapter.php
+++ b/plugins/filesystem/local/src/Adapter/LocalAdapter.php
@@ -66,7 +66,7 @@ class LocalAdapter implements AdapterInterface
public function __construct(string $rootPath, string $filePath)
{
if (!file_exists($rootPath)) {
- throw new \InvalidArgumentException();
+ throw new \InvalidArgumentException(Text::_('COM_MEDIA_ERROR_MISSING_DIR'));
}
$this->rootPath = Path::clean(realpath($rootPath), '/');
```
PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/38867 Poniżej zmiany w oryginale:
Click to expand the diff!
```diff diff --git a/administrator/language/en-GB/com_media.ini b/administrator/language/en-GB/com_media.ini index 598ac5a0c1a4..0fd7852dc7cb 100644 --- a/administrator/language/en-GB/com_media.ini +++ b/administrator/language/en-GB/com_media.ini @@ -26,14 +26,17 @@ COM_MEDIA_EDIT="Media Edit" COM_MEDIA_ERROR="An error occurred." COM_MEDIA_ERROR_ACCOUNT_NOT_FOUND="The account was not found" COM_MEDIA_ERROR_ACCOUNT_NOT_SET="Account was not set." +COM_MEDIA_ERROR_MAKESAFE="Could not make the file name safe. If it contains non ASCII chars please ensure you have the INTL and ICONV PHP Extensions installed." COM_MEDIA_ERROR_MEDIA_PROVIDER_NOT_FOUND="Media Provider not found." -COM_MEDIA_ERROR_NO_ADAPTER_FOUND="No adapter found." -COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE="No content available!" -COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one filesystem plugin." +COM_MEDIA_ERROR_MISSING_DIR="One or more of the directories defined in the FileSystem - Local plugin does not exist." COM_MEDIA_ERROR_NOT_AUTHENTICATED="You are not authenticated. Please login." COM_MEDIA_ERROR_NOT_AUTHORIZED="You are not authorised" COM_MEDIA_ERROR_NOT_FOUND="File or Folder not found" +COM_MEDIA_ERROR_NO_ADAPTER_FOUND="No adapter found." +COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE="No content available!" +COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one filesystem plugin." COM_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload. You can change the limits for your site in the component options." +COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media" COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to attempt to verify files. Try disabling this if you get invalid mime type errors." COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types" COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads." @@ -46,10 +49,10 @@ COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_DESC="Document extensions (file types) COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_LABEL="Legal Document Extensions (File Types)" COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers." COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL="Legal Image Extensions (File Types)" -COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_DESC="Video extensions (file types) you are allowed to upload (comma separated). These are used to check for valid video headers." -COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_LABEL="Legal Video Extensions (File Types)" COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC="A comma separated list of legal MIME types to upload." COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL="Legal MIME Types" +COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_DESC="Video extensions (file types) you are allowed to upload (comma separated). These are used to check for valid video headers." +COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_LABEL="Legal Video Extensions (File Types)" COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC="Use zero for no limit. Note: your server has a maximum limit." COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL="Maximum Size (in MB)" COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC="Enter the path to the files folder relative to the root of your webspace. Warning! Changing to another path than the default 'images' may break your links. Note: Do not start the path with a slash!" @@ -60,12 +63,11 @@ COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager u COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_DESC="Restrict uploads for lower than manager users to files in the list." COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_LABEL="Allowed Extensions" COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads" -COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media" COM_MEDIA_FILE="File" COM_MEDIA_FILE_EXISTS_AND_OVERRIDE="%s already exists. Do you want to replace it?" COM_MEDIA_FOLDER="Folder" -COM_MEDIA_FOLDER_NAME="Folder Name" COM_MEDIA_FOLDERS="Media Folders" +COM_MEDIA_FOLDER_NAME="Folder Name" COM_MEDIA_INCREASE_GRID="Increase grid size" COM_MEDIA_MEDIA_DATE_CREATED="Date Created" COM_MEDIA_MEDIA_DATE_MODIFIED="Date Modified" @@ -80,7 +82,6 @@ COM_MEDIA_OPEN_ITEM_ACTIONS="Open item actions" COM_MEDIA_PLEASE_SELECT_ITEM="Please select item." COM_MEDIA_RENAME="Rename" COM_MEDIA_RENAME_ERROR="Error renaming item." -COM_MEDIA_ERROR_MAKESAFE="Could not make the file name safe. If it contains non ASCII chars please ensure you have the INTL and ICONV PHP Extensions installed." COM_MEDIA_RENAME_SUCCESS="Item renamed." COM_MEDIA_RESET="Reset" COM_MEDIA_SEARCH="Search" diff --git a/plugins/filesystem/local/src/Adapter/LocalAdapter.php b/plugins/filesystem/local/src/Adapter/LocalAdapter.php index df8c86bcc9f0..d17498c609fa 100644 --- a/plugins/filesystem/local/src/Adapter/LocalAdapter.php +++ b/plugins/filesystem/local/src/Adapter/LocalAdapter.php @@ -66,7 +66,7 @@ class LocalAdapter implements AdapterInterface public function __construct(string $rootPath, string $filePath) { if (!file_exists($rootPath)) { - throw new \InvalidArgumentException(); + throw new \InvalidArgumentException(Text::_('COM_MEDIA_ERROR_MISSING_DIR')); } $this->rootPath = Path::clean(realpath($rootPath), '/'); ```