Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3265729
Send all the form data
dgrammatiko Dec 19, 2021
d88638c
CS
dgrammatiko Dec 19, 2021
6596605
Merge branch '4.1-dev' into 4.1-dev-order-formdata
bembelimen Jan 7, 2022
2e2409d
Merge branch '4.1-dev' into 4.1-dev-order-formdata
dgrammatiko Jan 16, 2022
746b970
Merge branch '4.1-dev' into 4.1-dev-order-formdata
dgrammatiko Feb 3, 2022
5c105e8
Merge branch '4.1-dev' into 4.1-dev-order-formdata
laoneo Apr 1, 2022
3d90c16
Update input dependency which contains PHP 8.1 fixes (#37502)
laoneo Apr 13, 2022
99ce07f
[4.1] Use to PHP 8.1 fixes for debug bar dependency (#37488)
laoneo Apr 13, 2022
33919e9
[4.1] Schedule Tasks notification dates (#37556)
brianteeman Apr 15, 2022
30c3b2a
[4.1] Action Log commeents (#37558)
brianteeman Apr 15, 2022
bcd54b6
Description for class "Intro Image" (#37563)
Kostelano Apr 15, 2022
6203707
Show loading view in installer component properly (#37570)
Apr 19, 2022
208bfe8
Merge branch '4.1-dev' into 4.1-dev-order-formdata
laoneo Apr 19, 2022
6d8048e
cs (#37580)
heelc29 Apr 19, 2022
f761e62
[4.1] Remove php version to speed up the test (#37587)
rdeutz Apr 20, 2022
ad73297
Fix Deprecated for Calendar Form Field (#37373)
joomdonation Apr 20, 2022
bea30e6
XML Code style (#37581)
heelc29 Apr 20, 2022
1ee6427
[4.1] Multilingual Status [a11y] (#37559)
brianteeman Apr 20, 2022
34d4eeb
[4.1] Read More with Title (#37594)
brianteeman Apr 21, 2022
d39e01a
[4.1] com_media: hardcoded language strings (#37588)
pe7er Apr 21, 2022
6f2e9df
Update uri dependency to 2.0.2 (#37597)
laoneo Apr 21, 2022
198c0a0
Merge branch '4.1-dev' into 4.1-dev-order-formdata
laoneo Apr 22, 2022
67acb22
Merge pull request #36353 from dgrammatiko/4.1-dev-order-formdata
roland-d Apr 22, 2022
5551636
Update link.php (#35771)
kapetanov Apr 23, 2022
b2134d3
[4.x] List Filters (#37424)
brianteeman Apr 23, 2022
a06f8c0
add target and rel values for external links (#37475)
tecpromotion Apr 23, 2022
b07d1e5
implement RouterFactory (#37602)
heelc29 Apr 23, 2022
3a9e3fa
[4.1] Unnecessary description for layout (#37564)
Kostelano Apr 25, 2022
1127616
[4.1] Fire change events consistently on the media Field
dgrammatiko Apr 25, 2022
b391230
Merge branch '4.2-dev' into patch-2
dgrammatiko Apr 25, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,8 @@ clone_folder: C:\projects\joomla-cms
environment:
PHPBuild: "x64"
matrix:
- php_ver_target: 7.2
- php_ver_target: 7.3
- php_ver_target: 7.4
- php_ver_target: 8.0
- php_ver_target: 8.1

matrix:
allow_failures:
- php_ver_target: 8.1

init:
- SET PATH=C:\Tools\php;%PATH%
Expand Down
3 changes: 2 additions & 1 deletion administrator/components/com_cache/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
filter="rules"
validate="rules"
component="com_cache"
section="component" />
section="component"
/>
</fieldset>
</config>
5 changes: 3 additions & 2 deletions administrator/components/com_config/forms/application.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
filter="integer"
validate="number"
showon="caching:1,2"
/>
/>

<field
name="cache_path"
Expand Down Expand Up @@ -173,7 +173,8 @@
label="COM_CONFIG_FIELD_DATABASE_TYPE_LABEL"
description="COM_CONFIG_FIELD_DATABASE_TYPE_DESC"
supported="mysql,mysqli,pgsql,postgresql"
filter="string" />
filter="string"
/>

<field
name="host"
Expand Down
30 changes: 15 additions & 15 deletions administrator/components/com_contact/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -838,22 +838,22 @@
</field>

<field
name="contacts_display_num"
type="list"
label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
default="10"
name="contacts_display_num"
type="list"
label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
default="10"
validate="options"
>
<option value="5">J5</option>
<option value="10">J10</option>
<option value="15">J15</option>
<option value="20">J20</option>
<option value="25">J25</option>
<option value="30">J30</option>
<option value="50">J50</option>
<option value="100">J100</option>
<option value="0">JALL</option>
</field>
>
<option value="5">J5</option>
<option value="10">J10</option>
<option value="15">J15</option>
<option value="20">J20</option>
<option value="25">J25</option>
<option value="30">J30</option>
<option value="50">J50</option>
<option value="100">J100</option>
<option value="0">JALL</option>
</field>

<field
name="initial_sort"
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_contact/forms/contact.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
type="text"
label="COM_CONTACT_FIELD_NAME_LABEL"
required="true"
/>
/>

<field
name="alias"
Expand Down Expand Up @@ -167,7 +167,7 @@
label="JFIELD_META_KEYWORDS_LABEL"
rows="3"
cols="30"
/>
/>

<field
name="metadesc"
Expand Down
4 changes: 3 additions & 1 deletion administrator/components/com_content/forms/article.xml
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,8 @@
type="hidden"
label="JFIELD_ALT_LAYOUT_LABEL"
useglobal="true"
extension="com_content" view="article"
extension="com_content"
view="article"
/>
</fieldset>
</fields>
Expand Down Expand Up @@ -738,6 +739,7 @@
name="float_intro"
type="text"
label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
description="COM_CONTENT_FIELD_IMAGE_CLASS_DESC"
useglobal="true"
/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
step="1"
languages="*"
onchange="this.form.submit();"
>
>
<option value="">JOPTION_SELECT_MAX_LEVELS</option>
</field>
</fields>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_finder/forms/filter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
readonly="true"
filter="unset"
validate="UserId"
/>
/>

<field
name="checked_out"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<?php endif; ?>
<?php endforeach; ?>
<table class="table table-sm">
<caption class="visually-hidden"><?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_TABLE_CAPTION'); ?></caption>
<thead>
<tr>
<th scope="col">
Expand Down Expand Up @@ -201,6 +202,7 @@
</tbody>
</table>
<table class="table table-sm">
<caption class="visually-hidden"><?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_TABLE_CAPTION'); ?></caption>
<thead>
<tr>
<th scope="col">
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,6 @@
validate="rules"
component="com_media"
section="component"
/>
/>
</fieldset>
</config>
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

\defined('_JEXEC') or die;

use Joomla\CMS\Language\Text;
use Joomla\Component\Media\Administrator\Adapter\AdapterInterface;

/**
Expand Down Expand Up @@ -96,7 +97,7 @@ public function getProvider($id)
{
if (!isset($this->providers[$id]))
{
throw new \Exception("Media Provider not found");
throw new \Exception(Text::_('COM_MEDIA_ERROR_MEDIA_PROVIDER_NOT_FOUND'));
}

return $this->providers[$id];
Expand All @@ -119,14 +120,14 @@ public function getAdapter($name)

if ($account == null)
{
throw new \Exception('Account was not set');
throw new \Exception(Text::_('COM_MEDIA_ERROR_ACCOUNT_NOT_SET'));
}

$adapters = $this->getProvider($provider)->getAdapters();

if (!isset($adapters[$account]))
{
throw new \Exception("The account was not found");
throw new \Exception(Text::_('COM_MEDIA_ERROR_ACCOUNT_NOT_FOUND'));
}

return $adapters[$account];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\Component\Media\Administrator\Adapter\AdapterInterface;
use Joomla\Component\Media\Administrator\Event\MediaProviderEvent;
Expand Down Expand Up @@ -117,7 +118,7 @@ protected function resolveAdapterAndPath(String $path): array

if (!$this->getDefaultAdapterName())
{
throw new \InvalidArgumentException('No adapter found');
throw new \InvalidArgumentException(Text::_('COM_MEDIA_ERROR_NO_ADAPTER_FOUND'));
}

// If we have less than 2 parts, we return a default adapter name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function display($tpl = null)
if (empty($this->file->content))
{
// @todo error handling controller redirect files
throw new \Exception('No content available!');
throw new \Exception(Text::_('COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE'));
}

$this->addToolbar();
Expand Down
3 changes: 2 additions & 1 deletion administrator/components/com_menus/forms/item_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
type="radio"
label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
layout="joomla.form.field.radio.switcher"
default="1" filter="integer"
default="1"
filter="integer"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
Expand Down
4 changes: 4 additions & 0 deletions administrator/components/com_privacy/services/provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@

defined('_JEXEC') or die;

use Joomla\CMS\Component\Router\RouterFactoryInterface;
use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
use Joomla\CMS\Extension\ComponentInterface;
use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
use Joomla\CMS\Extension\Service\Provider\MVCFactory;
use Joomla\CMS\Extension\Service\Provider\RouterFactory;
use Joomla\CMS\HTML\Registry;
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
use Joomla\Component\Privacy\Administrator\Extension\PrivacyComponent;
Expand All @@ -39,6 +41,7 @@ public function register(Container $container)
{
$container->registerServiceProvider(new MVCFactory('\\Joomla\\Component\\Privacy'));
$container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Privacy'));
$container->registerServiceProvider(new RouterFactory('\\Joomla\\Component\\Privacy'));

$container->set(
ComponentInterface::class,
Expand All @@ -48,6 +51,7 @@ function (Container $container)

$component->setMVCFactory($container->get(MVCFactoryInterface::class));
$component->setRegistry($container->get(Registry::class));
$component->setRouterFactory($container->get(RouterFactoryInterface::class));

return $component;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

\defined('JPATH_PLATFORM') or die;

use Joomla\CMS\Component\Router\RouterServiceInterface;
use Joomla\CMS\Component\Router\RouterServiceTrait;
use Joomla\CMS\Extension\BootableExtensionInterface;
use Joomla\CMS\Extension\MVCComponent;
use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
Expand All @@ -22,9 +24,10 @@
*
* @since 4.0.0
*/
class PrivacyComponent extends MVCComponent implements BootableExtensionInterface
class PrivacyComponent extends MVCComponent implements BootableExtensionInterface, RouterServiceInterface
{
use HTMLRegistryAwareTrait;
use RouterServiceTrait;

/**
* Booting the extension. This is the function to set up the environment of the extension like
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_redirect/forms/link.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
default="0"
readonly="true"
class="readonly"
/>
/>

<field
name="old_url"
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/forms/source.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<field
name="filename"
type="hidden"
/>
/>

<field
name="source"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,7 @@ public function uploadFile($file, $location)
if ($this->getTemplate())
{
$app = Factory::getApplication();
$path = $this->getBasePath();;
$path = $this->getBasePath();
$fileName = File::makeSafe($file['name']);

$err = null;
Expand Down
14 changes: 7 additions & 7 deletions administrator/components/com_users/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -264,23 +264,23 @@

</fieldset>

<fieldset
<fieldset
name="massmail"
label="COM_USERS_MASS_MAIL"
description="COM_USERS_MASS_MAIL_DESC">

<field
name="mailSubjectPrefix"
type="text"
name="mailSubjectPrefix"
type="text"
label="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL"
/>

<field
name="mailBodySuffix"
<field
name="mailBodySuffix"
type="textarea"
label="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_LABEL"
rows="5"
cols="30"
rows="5"
cols="30"
/>

</fieldset>
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/com_installer.ini
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB="The installer can't continue until Zl
COM_INSTALLER_MSG_LANGUAGES_CANT_FIND_REMOTE_MANIFEST="The installer can't get the URL to the XML manifest file of the %s language."
COM_INSTALLER_MSG_LANGUAGES_CANT_FIND_REMOTE_PACKAGE="The installer can't get the URL to the remote %s language."
COM_INSTALLER_MSG_LANGUAGES_NOLANGUAGES="There are no available languages to install at the moment. Please select the &quot;Find languages&quot; button to check for updates on the Joomla! Languages server. You will need an internet connection for this to work."
COM_INSTALLER_MSG_LANGUAGES_TRY_LATER="Try again later or <a href=\"https://downloads.joomla.org/language-packs\">contact the language team coordinator</a>."
COM_INSTALLER_MSG_LANGUAGES_TRY_LATER="Try again later or <a href=\"https://downloads.joomla.org/language-packs\" target=\"_blank\" rel=\"noopener noreferrer\">contact the language team coordinator</a>."
COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL="%d Database Problems Found."
COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL_1="One Database Problem Found."
COM_INSTALLER_MSG_UPDATE_ERROR="Error updating %s."
Expand All @@ -176,7 +176,7 @@ COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt fr
COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. No extension with updates sites discovered."
COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER="The update table is not up to date. Please <a href=\"index.php?option=com_installer&view=updatesites\">rebuild your update server table</a>"
COM_INSTALLER_MSG_WARNINGFURTHERINFO="Further information on warnings"
COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information see the <a href=\"https://docs.joomla.org/Special:MyLanguage/Help4.x:Information:_Warnings\" target=\"_blank\" class=\"alert-link\">Joomla! Documentation Site</a>."
COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information see the <a href=\"https://docs.joomla.org/Special:MyLanguage/Help4.x:Information:_Warnings\" class=\"alert-link\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Documentation Site</a>."
COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC="File uploads are required to upload extensions with the installer."
COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED="File uploads disabled."
COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The Joomla temporary folder is not set."
Expand Down
4 changes: 3 additions & 1 deletion administrator/language/en-GB/com_languages.ini
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,22 @@ COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_MISSING="The <strong>%s</strong>
COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED="Published Content Languages"
COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_SEF_MISSING="The \"URL Language Code\" is missing for the <strong>%s</strong> Content Language. <strong>The multilingual feature may not function properly or the site may not be reachable!</strong>"
COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_TRASHED="The <strong>%s</strong> Content Language is trashed. <strong>The language will not display on the site.</strong>"
COM_LANGUAGES_MULTILANGSTATUS_CONTENT_TABLE_CAPTION="Table of the status for each content language."
COM_LANGUAGES_MULTILANGSTATUS_DEFAULT_HOME_MODULE_PUBLISHED="The menu module displaying the Home menu item set to language &quot;All&quot; should not be published."
COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE="A Default Home page is assigned to the <strong>%s</strong> Content Language although a Site Language for this Content Language is not installed or enabled AND/OR the Content Language is not published. <strong>The language will not display on the site.</strong>"
COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE="The Content Language for the <strong>%s</strong> default Site Language is unpublished or does not exist. <strong>The multilingual feature may not function properly or the site may not be reachable!</strong>"
COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG="The Content Language tag <strong>%s</strong> does not have a matching Site Language tag. Check that the Site Language is installed and enabled AND the correct language tag is used for the Content Language. Example: for English (en-GB) both tags should be 'en-GB'. <strong>The language will not display on the site.</strong>"
COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the <strong>%s</strong> Content Language is unpublished. <strong>The language will not display on the site.</strong>"
COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED="Published Default Home pages"
COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_ALL="1 assigned to language 'All'."
COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_INCLUDING_ALL="Published Default Home pages (including 1 assigned to language &quot;All&quot;)."
COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the <strong>%s</strong> Content Language is unpublished. <strong>The language will not display on the site.</strong>"
COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_PUBLISHED="Published Language Switcher Modules."
COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_UNPUBLISHED="At least one Language Switcher module set to language &quot;All&quot; has to be published. Otherwise, it will be impossible to switch languages on the site. Disregard this message if you do not use a language switcher module but direct links."
COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER="Language Filter Plugin"
COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER_DISABLED="The Language Filter plugin is not enabled although one or more Language Switcher modules AND/OR one or more specific Content language Default Home pages are published."
COM_LANGUAGES_MULTILANGSTATUS_NONE="This site is not set as a multilingual site."
COM_LANGUAGES_MULTILANGSTATUS_SITE_LANG_PUBLISHED="Enabled Site Languages"
COM_LANGUAGES_MULTILANGSTATUS_TABLE_CAPTION="Table of the multilingual status."
COM_LANGUAGES_MULTILANGSTATUS_USELESS_HOMES="This site is not set as a multilingual site.<br><strong>Note</strong>: at least one Default Home page is assigned to a Content Language. This will not break a monolingual site but is useless."
COM_LANGUAGES_N_ITEMS_DELETED="%d Content Languages deleted."
COM_LANGUAGES_N_ITEMS_DELETED_1="Content Language deleted."
Expand Down
5 changes: 5 additions & 0 deletions administrator/language/en-GB/com_media.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ COM_MEDIA_DELETE_SUCCESS="Item deleted."
COM_MEDIA_DROP_FILE="Drop file(s) to Upload"
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_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 <a href=\"%s\">filesystem plugin</a>."
COM_MEDIA_ERROR_NOT_AUTHENTICATED="You are not authenticated. Please login."
COM_MEDIA_ERROR_NOT_AUTHORIZED="You are not authorised"
Expand Down
Loading