diff --git a/administrator/components/com_actionlogs/models/forms/filter_actionlogs.xml b/administrator/components/com_actionlogs/models/forms/filter_actionlogs.xml index 634c1609582..73441dbe7e5 100644 --- a/administrator/components/com_actionlogs/models/forms/filter_actionlogs.xml +++ b/administrator/components/com_actionlogs/models/forms/filter_actionlogs.xml @@ -41,6 +41,7 @@ description="COM_ACTIONLOGS_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.id DESC" + validate="options" > diff --git a/administrator/components/com_associations/models/forms/filter_associations.xml b/administrator/components/com_associations/models/forms/filter_associations.xml index 9563de44896..1a9ddca3423 100644 --- a/administrator/components/com_associations/models/forms/filter_associations.xml +++ b/administrator/components/com_associations/models/forms/filter_associations.xml @@ -94,6 +94,7 @@ type="list" default="id ASC" onchange="this.form.submit();" + validate="options" > diff --git a/administrator/components/com_banners/models/forms/filter_banners.xml b/administrator/components/com_banners/models/forms/filter_banners.xml index 76268022c7f..c32732ba450 100644 --- a/administrator/components/com_banners/models/forms/filter_banners.xml +++ b/administrator/components/com_banners/models/forms/filter_banners.xml @@ -75,6 +75,7 @@ statuses="*,0,1,2,-2" onchange="this.form.submit();" default="a.name ASC" + validate="options" > diff --git a/administrator/components/com_banners/models/forms/filter_clients.xml b/administrator/components/com_banners/models/forms/filter_clients.xml index 1552335b637..fd538a8c27b 100644 --- a/administrator/components/com_banners/models/forms/filter_clients.xml +++ b/administrator/components/com_banners/models/forms/filter_clients.xml @@ -44,6 +44,7 @@ statuses="*,0,1,2,-2" onchange="this.form.submit();" default="a.name ASC" + validate="options" > diff --git a/administrator/components/com_banners/models/forms/filter_tracks.xml b/administrator/components/com_banners/models/forms/filter_tracks.xml index 4755a8c3f2c..49e0f21d851 100644 --- a/administrator/components/com_banners/models/forms/filter_tracks.xml +++ b/administrator/components/com_banners/models/forms/filter_tracks.xml @@ -85,6 +85,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="b.name ASC" + validate="options" > diff --git a/administrator/components/com_cache/models/forms/filter_cache.xml b/administrator/components/com_cache/models/forms/filter_cache.xml index 9e83948eaf0..1782ee00a68 100644 --- a/administrator/components/com_cache/models/forms/filter_cache.xml +++ b/administrator/components/com_cache/models/forms/filter_cache.xml @@ -27,6 +27,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="group ASC" + validate="options" > diff --git a/administrator/components/com_categories/models/forms/filter_categories.xml b/administrator/components/com_categories/models/forms/filter_categories.xml index 5573d4aba3f..c651b3746ad 100644 --- a/administrator/components/com_categories/models/forms/filter_categories.xml +++ b/administrator/components/com_categories/models/forms/filter_categories.xml @@ -78,6 +78,7 @@ default="a.lft ASC" statuses="*,0,1,2,-2" onchange="this.form.submit();" + validate="options" > diff --git a/administrator/components/com_checkin/models/forms/filter_checkin.xml b/administrator/components/com_checkin/models/forms/filter_checkin.xml index e203f51ae1a..b627d939fc2 100644 --- a/administrator/components/com_checkin/models/forms/filter_checkin.xml +++ b/administrator/components/com_checkin/models/forms/filter_checkin.xml @@ -18,6 +18,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="table ASC" + validate="options" > diff --git a/administrator/components/com_contact/models/forms/filter_contacts.xml b/administrator/components/com_contact/models/forms/filter_contacts.xml index 60c8ad7d62d..c106396eefc 100644 --- a/administrator/components/com_contact/models/forms/filter_contacts.xml +++ b/administrator/components/com_contact/models/forms/filter_contacts.xml @@ -89,6 +89,7 @@ description="COM_CONTACT_LIST_FULL_ORDERING_DESC" default="a.name ASC" onchange="this.form.submit();" + validate="options" > diff --git a/administrator/components/com_content/models/forms/filter_articles.xml b/administrator/components/com_content/models/forms/filter_articles.xml index 2e1995ca81e..859948681fa 100644 --- a/administrator/components/com_content/models/forms/filter_articles.xml +++ b/administrator/components/com_content/models/forms/filter_articles.xml @@ -99,6 +99,7 @@ description="COM_CONTENT_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.id DESC" + validate="options" > diff --git a/administrator/components/com_content/models/forms/filter_featured.xml b/administrator/components/com_content/models/forms/filter_featured.xml index 79bbe00fa71..48da0917187 100644 --- a/administrator/components/com_content/models/forms/filter_featured.xml +++ b/administrator/components/com_content/models/forms/filter_featured.xml @@ -97,6 +97,7 @@ description="COM_CONTENT_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.title ASC" + validate="options" > diff --git a/administrator/components/com_fields/models/forms/filter_fields.xml b/administrator/components/com_fields/models/forms/filter_fields.xml index b76745dbd84..6f355704bf4 100644 --- a/administrator/components/com_fields/models/forms/filter_fields.xml +++ b/administrator/components/com_fields/models/forms/filter_fields.xml @@ -68,6 +68,7 @@ statuses="*,0,1,2,-2" onchange="this.form.submit();" default="a.ordering ASC" + validate="options" > diff --git a/administrator/components/com_fields/models/forms/filter_groups.xml b/administrator/components/com_fields/models/forms/filter_groups.xml index b0c6126d916..9089eac15dc 100644 --- a/administrator/components/com_fields/models/forms/filter_groups.xml +++ b/administrator/components/com_fields/models/forms/filter_groups.xml @@ -48,6 +48,7 @@ label="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.ordering ASC" + validate="options" > diff --git a/administrator/components/com_finder/models/forms/filter_filters.xml b/administrator/components/com_finder/models/forms/filter_filters.xml index f5ea1528f99..f24cb25acbf 100644 --- a/administrator/components/com_finder/models/forms/filter_filters.xml +++ b/administrator/components/com_finder/models/forms/filter_filters.xml @@ -27,6 +27,7 @@ type="list" onchange="this.form.submit();" default="a.title ASC" + validate="options" > diff --git a/administrator/components/com_finder/models/forms/filter_index.xml b/administrator/components/com_finder/models/forms/filter_index.xml index 0e380177064..d143254baec 100644 --- a/administrator/components/com_finder/models/forms/filter_index.xml +++ b/administrator/components/com_finder/models/forms/filter_index.xml @@ -47,6 +47,7 @@ type="list" onchange="this.form.submit();" default="l.title ASC" + validate="options" > diff --git a/administrator/components/com_finder/models/forms/filter_maps.xml b/administrator/components/com_finder/models/forms/filter_maps.xml index 312d66aa9a8..8c30d0034a6 100644 --- a/administrator/components/com_finder/models/forms/filter_maps.xml +++ b/administrator/components/com_finder/models/forms/filter_maps.xml @@ -48,6 +48,7 @@ type="list" onchange="this.form.submit();" default="d.branch_title ASC" + validate="options" > diff --git a/administrator/components/com_installer/models/forms/filter_discover.xml b/administrator/components/com_installer/models/forms/filter_discover.xml index b11e1f2dd43..23a16848f66 100644 --- a/administrator/components/com_installer/models/forms/filter_discover.xml +++ b/administrator/components/com_installer/models/forms/filter_discover.xml @@ -44,6 +44,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="name ASC" + validate="options" > diff --git a/administrator/components/com_installer/models/forms/filter_languages.xml b/administrator/components/com_installer/models/forms/filter_languages.xml index bf421173091..31ad77f949e 100644 --- a/administrator/components/com_installer/models/forms/filter_languages.xml +++ b/administrator/components/com_installer/models/forms/filter_languages.xml @@ -17,6 +17,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="name ASC" + validate="options" > diff --git a/administrator/components/com_installer/models/forms/filter_manage.xml b/administrator/components/com_installer/models/forms/filter_manage.xml index c6553e2e1b9..35fdfa697dc 100644 --- a/administrator/components/com_installer/models/forms/filter_manage.xml +++ b/administrator/components/com_installer/models/forms/filter_manage.xml @@ -54,6 +54,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="name ASC" + validate="options" > diff --git a/administrator/components/com_installer/models/forms/filter_update.xml b/administrator/components/com_installer/models/forms/filter_update.xml index 27493b8e90e..c9f40eb8604 100644 --- a/administrator/components/com_installer/models/forms/filter_update.xml +++ b/administrator/components/com_installer/models/forms/filter_update.xml @@ -40,6 +40,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="u.name ASC" + validate="options" > diff --git a/administrator/components/com_installer/models/forms/filter_updatesites.xml b/administrator/components/com_installer/models/forms/filter_updatesites.xml index ec17aeec064..092f58a2935 100644 --- a/administrator/components/com_installer/models/forms/filter_updatesites.xml +++ b/administrator/components/com_installer/models/forms/filter_updatesites.xml @@ -51,6 +51,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="name ASC" + validate="options" > diff --git a/administrator/components/com_languages/models/forms/filter_installed.xml b/administrator/components/com_languages/models/forms/filter_installed.xml index 2ab9f1e90cc..424c9bf6f97 100644 --- a/administrator/components/com_languages/models/forms/filter_installed.xml +++ b/administrator/components/com_languages/models/forms/filter_installed.xml @@ -27,6 +27,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="name ASC" + validate="options" > diff --git a/administrator/components/com_languages/models/forms/filter_languages.xml b/administrator/components/com_languages/models/forms/filter_languages.xml index b770f5b0e76..9e94d2c8f0b 100644 --- a/administrator/components/com_languages/models/forms/filter_languages.xml +++ b/administrator/components/com_languages/models/forms/filter_languages.xml @@ -32,6 +32,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.ordering ASC" + validate="options" > diff --git a/administrator/components/com_menus/models/forms/filter_items.xml b/administrator/components/com_menus/models/forms/filter_items.xml index 28672454e21..f12106aef6e 100644 --- a/administrator/components/com_menus/models/forms/filter_items.xml +++ b/administrator/components/com_menus/models/forms/filter_items.xml @@ -93,6 +93,7 @@ statuses="*,0,1,2,-2" onchange="this.form.submit();" default="a.lft ASC" + validate="options" > diff --git a/administrator/components/com_menus/models/forms/filter_itemsadmin.xml b/administrator/components/com_menus/models/forms/filter_itemsadmin.xml index d31482bd058..e150ccb2ff6 100644 --- a/administrator/components/com_menus/models/forms/filter_itemsadmin.xml +++ b/administrator/components/com_menus/models/forms/filter_itemsadmin.xml @@ -66,6 +66,7 @@ statuses="*,0,1,2,-2" onchange="this.form.submit();" default="a.lft ASC" + validate="options" > diff --git a/administrator/components/com_menus/models/forms/filter_menus.xml b/administrator/components/com_menus/models/forms/filter_menus.xml index 1d5cdefd7c3..16532d9e491 100644 --- a/administrator/components/com_menus/models/forms/filter_menus.xml +++ b/administrator/components/com_menus/models/forms/filter_menus.xml @@ -27,6 +27,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.title ASC" + validate="options" > diff --git a/administrator/components/com_messages/models/forms/filter_messages.xml b/administrator/components/com_messages/models/forms/filter_messages.xml index 719e73a21b8..98248b75778 100644 --- a/administrator/components/com_messages/models/forms/filter_messages.xml +++ b/administrator/components/com_messages/models/forms/filter_messages.xml @@ -27,6 +27,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.date_time DESC" + validate="options" > diff --git a/administrator/components/com_modules/models/forms/filter_modules.xml b/administrator/components/com_modules/models/forms/filter_modules.xml index 4728b3d43b3..6a6b041170a 100644 --- a/administrator/components/com_modules/models/forms/filter_modules.xml +++ b/administrator/components/com_modules/models/forms/filter_modules.xml @@ -86,6 +86,7 @@ statuses="*,0,1,-2" onchange="this.form.submit();" default="a.position ASC" + validate="options" > diff --git a/administrator/components/com_modules/models/forms/filter_modulesadmin.xml b/administrator/components/com_modules/models/forms/filter_modulesadmin.xml index 3f1eb3771d1..2d5800327f3 100644 --- a/administrator/components/com_modules/models/forms/filter_modulesadmin.xml +++ b/administrator/components/com_modules/models/forms/filter_modulesadmin.xml @@ -77,6 +77,7 @@ statuses="*,0,1,-2" onchange="this.form.submit();" default="a.position ASC" + validate="options" > diff --git a/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml b/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml index 60f597b38c7..b3add958a4d 100644 --- a/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml +++ b/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml @@ -88,6 +88,7 @@ description="COM_NEWSFEEDS_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.name ASC" + validate="options" > diff --git a/administrator/components/com_plugins/models/forms/filter_plugins.xml b/administrator/components/com_plugins/models/forms/filter_plugins.xml index ef281520baa..ea460590727 100644 --- a/administrator/components/com_plugins/models/forms/filter_plugins.xml +++ b/administrator/components/com_plugins/models/forms/filter_plugins.xml @@ -54,6 +54,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="folder ASC" + validate="options" > diff --git a/administrator/components/com_privacy/models/forms/filter_consents.xml b/administrator/components/com_privacy/models/forms/filter_consents.xml index a133dcf13a0..866dd9e99af 100644 --- a/administrator/components/com_privacy/models/forms/filter_consents.xml +++ b/administrator/components/com_privacy/models/forms/filter_consents.xml @@ -47,6 +47,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.id DESC" + validate="options" > diff --git a/administrator/components/com_privacy/models/forms/filter_requests.xml b/administrator/components/com_privacy/models/forms/filter_requests.xml index 697ba2188ba..4b9b25a1b48 100644 --- a/administrator/components/com_privacy/models/forms/filter_requests.xml +++ b/administrator/components/com_privacy/models/forms/filter_requests.xml @@ -40,6 +40,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.id DESC" + validate="options" > diff --git a/administrator/components/com_redirect/models/forms/filter_links.xml b/administrator/components/com_redirect/models/forms/filter_links.xml index ae51da8f3f2..900e7012ea8 100644 --- a/administrator/components/com_redirect/models/forms/filter_links.xml +++ b/administrator/components/com_redirect/models/forms/filter_links.xml @@ -35,6 +35,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.old_url ASC" + validate="options" > diff --git a/administrator/components/com_search/models/forms/filter_searches.xml b/administrator/components/com_search/models/forms/filter_searches.xml index c22da9f46fa..76114446ea4 100644 --- a/administrator/components/com_search/models/forms/filter_searches.xml +++ b/administrator/components/com_search/models/forms/filter_searches.xml @@ -15,6 +15,7 @@ type="list" onchange="this.form.submit();" default="a.hits ASC" + validate="options" > diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml index 99b790df5ed..30623cfa75a 100644 --- a/administrator/components/com_tags/config.xml +++ b/administrator/components/com_tags/config.xml @@ -86,6 +86,7 @@ label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL" description="JGLOBAL_FIELD_FIELD_ORDERING_DESC" default="title" + validate="options" > @@ -124,6 +125,7 @@ label="COM_TAGS_TAG_LIST_SHOW_DATE_DESC" description="COM_TAGS_TAG_LIST_SHOW_DATE_LABEL" default="0" + validate="options" > @@ -248,6 +250,7 @@ label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL" description="JGLOBAL_FIELD_FIELD_ORDERING_DESC" default="title" + validate="options" > diff --git a/administrator/components/com_tags/models/forms/filter_tags.xml b/administrator/components/com_tags/models/forms/filter_tags.xml index 63d08d83948..40ea8244263 100644 --- a/administrator/components/com_tags/models/forms/filter_tags.xml +++ b/administrator/components/com_tags/models/forms/filter_tags.xml @@ -66,6 +66,7 @@ description="COM_TAGS_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.lft ASC" + validate="options" > diff --git a/administrator/components/com_templates/models/forms/filter_styles.xml b/administrator/components/com_templates/models/forms/filter_styles.xml index 1578ff8020d..96ae50c8def 100644 --- a/administrator/components/com_templates/models/forms/filter_styles.xml +++ b/administrator/components/com_templates/models/forms/filter_styles.xml @@ -46,6 +46,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.template ASC" + validate="options" > diff --git a/administrator/components/com_templates/models/forms/filter_templates.xml b/administrator/components/com_templates/models/forms/filter_templates.xml index 7a4c190b0af..32b4ec68ab6 100644 --- a/administrator/components/com_templates/models/forms/filter_templates.xml +++ b/administrator/components/com_templates/models/forms/filter_templates.xml @@ -28,6 +28,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.element ASC" + validate="options" > diff --git a/administrator/components/com_users/models/forms/filter_debuggroup.xml b/administrator/components/com_users/models/forms/filter_debuggroup.xml index 72eb8deb0e0..ffe3628fdc5 100644 --- a/administrator/components/com_users/models/forms/filter_debuggroup.xml +++ b/administrator/components/com_users/models/forms/filter_debuggroup.xml @@ -46,6 +46,7 @@ type="list" onchange="this.form.submit();" default="a.lft ASC" + validate="options" > diff --git a/administrator/components/com_users/models/forms/filter_debuguser.xml b/administrator/components/com_users/models/forms/filter_debuguser.xml index f09569a9e94..ad304e110d7 100644 --- a/administrator/components/com_users/models/forms/filter_debuguser.xml +++ b/administrator/components/com_users/models/forms/filter_debuguser.xml @@ -42,6 +42,7 @@ type="list" onchange="this.form.submit();" default="a.lft ASC" + validate="options" > diff --git a/administrator/components/com_users/models/forms/filter_groups.xml b/administrator/components/com_users/models/forms/filter_groups.xml index 1bc22b0469c..288e5477d00 100644 --- a/administrator/components/com_users/models/forms/filter_groups.xml +++ b/administrator/components/com_users/models/forms/filter_groups.xml @@ -17,6 +17,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.lft ASC" + validate="options" > diff --git a/administrator/components/com_users/models/forms/filter_levels.xml b/administrator/components/com_users/models/forms/filter_levels.xml index 081189f1068..ee341bf8242 100644 --- a/administrator/components/com_users/models/forms/filter_levels.xml +++ b/administrator/components/com_users/models/forms/filter_levels.xml @@ -17,6 +17,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.ordering ASC" + validate="options" > diff --git a/administrator/components/com_users/models/forms/filter_notes.xml b/administrator/components/com_users/models/forms/filter_notes.xml index b4895e2e1a2..23bd215e2e5 100644 --- a/administrator/components/com_users/models/forms/filter_notes.xml +++ b/administrator/components/com_users/models/forms/filter_notes.xml @@ -47,6 +47,7 @@ description="JGLOBAL_SORT_BY" onchange="this.form.submit();" default="a.review_time DESC" + validate="options" > diff --git a/administrator/components/com_users/models/forms/filter_users.xml b/administrator/components/com_users/models/forms/filter_users.xml index af0a88b65b6..3f7415f9fce 100644 --- a/administrator/components/com_users/models/forms/filter_users.xml +++ b/administrator/components/com_users/models/forms/filter_users.xml @@ -62,6 +62,7 @@ description="COM_CONTENT_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.name ASC" + validate="options" > diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 6367ff88881..f80582c95cb 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2005 - 2019 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.9.14-dev + 3.9.14 December 2019 FILES_JOOMLA_XML_DESCRIPTION diff --git a/components/com_contact/models/forms/filter_contacts.xml b/components/com_contact/models/forms/filter_contacts.xml index 6272238fbad..d33d75f18e5 100644 --- a/components/com_contact/models/forms/filter_contacts.xml +++ b/components/com_contact/models/forms/filter_contacts.xml @@ -89,6 +89,7 @@ description="COM_CONTACT_LIST_FULL_ORDERING_DESC" default="a.name ASC" onchange="this.form.submit();" + validate="options" > diff --git a/components/com_content/models/forms/filter_articles.xml b/components/com_content/models/forms/filter_articles.xml index 0879221dcc0..6145f86fc42 100644 --- a/components/com_content/models/forms/filter_articles.xml +++ b/components/com_content/models/forms/filter_articles.xml @@ -97,6 +97,7 @@ description="COM_CONTENT_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.title ASC" + validate="options" > @@ -135,4 +136,4 @@ onchange="this.form.submit();" /> - \ No newline at end of file + diff --git a/components/com_fields/models/forms/filter_fields.xml b/components/com_fields/models/forms/filter_fields.xml index bea14c55447..9fc2f706798 100644 --- a/components/com_fields/models/forms/filter_fields.xml +++ b/components/com_fields/models/forms/filter_fields.xml @@ -68,6 +68,7 @@ statuses="*,0,1,2,-2" onchange="this.form.submit();" default="a.ordering ASC" + validate="options" > diff --git a/components/com_menus/models/forms/filter_items.xml b/components/com_menus/models/forms/filter_items.xml index f6179f04b9c..00dd43e9a5e 100644 --- a/components/com_menus/models/forms/filter_items.xml +++ b/components/com_menus/models/forms/filter_items.xml @@ -61,6 +61,7 @@ statuses="*,0,1,2,-2" onchange="this.form.submit();" default="a.lft ASC" + validate="options" > diff --git a/components/com_modules/models/forms/filter_modules.xml b/components/com_modules/models/forms/filter_modules.xml index 0d25444b310..c0838b62754 100644 --- a/components/com_modules/models/forms/filter_modules.xml +++ b/components/com_modules/models/forms/filter_modules.xml @@ -46,6 +46,7 @@ statuses="*,0,1,-2" onchange="this.form.submit();" default="a.position ASC" + validate="options" > diff --git a/libraries/fof/utils/update/collection.php b/libraries/fof/utils/update/collection.php index cbea01aa505..84ac441b289 100644 --- a/libraries/fof/utils/update/collection.php +++ b/libraries/fof/utils/update/collection.php @@ -4,6 +4,7 @@ * @subpackage utils * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author. */ // Protect from unauthorized access @@ -103,13 +104,13 @@ class FOFUtilsUpdateCollection // We can't have a category with an empty category name if (empty($params['category'])) { - continue; + break; } // We can't have a category with an empty ref if (empty($params['ref'])) { - continue; + break; } if (empty($params['description'])) @@ -149,19 +150,19 @@ class FOFUtilsUpdateCollection // We can't have an extension with an empty element if (empty($params['element'])) { - continue; + break; } // We can't have an extension with an empty type if (empty($params['type'])) { - continue; + break; } // We can't have an extension with an empty version if (empty($params['version'])) { - continue; + break; } if (empty($params['name'])) diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php index f9c0dae0cfb..18375dcae44 100644 --- a/libraries/import.legacy.php +++ b/libraries/import.legacy.php @@ -92,4 +92,4 @@ JLoader::register('LogException', JPATH_PLATFORM . '/legacy/log/logexception.php JLoader::register('JXMLElement', JPATH_PLATFORM . '/legacy/utilities/xmlelement.php'); JLoader::register('JCli', JPATH_PLATFORM . '/legacy/application/cli.php'); JLoader::register('JDaemon', JPATH_PLATFORM . '/legacy/application/daemon.php'); -JLoader::register('JApplication', JPATH_LIBRARIES . '/legacy/application/application.php'); +JLoader::register('JApplication', JPATH_PLATFORM . '/legacy/application/application.php'); diff --git a/libraries/src/Log/DelegatingPsrLogger.php b/libraries/src/Log/DelegatingPsrLogger.php index e349c3dc3c5..79810cc3596 100644 --- a/libraries/src/Log/DelegatingPsrLogger.php +++ b/libraries/src/Log/DelegatingPsrLogger.php @@ -8,6 +8,8 @@ namespace Joomla\CMS\Log; +defined('JPATH_PLATFORM') or die; + use Psr\Log\AbstractLogger; use Psr\Log\InvalidArgumentException; use Psr\Log\LogLevel; diff --git a/libraries/src/Version.php b/libraries/src/Version.php index cc9b5bf194c..6ec26deeea9 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -60,7 +60,7 @@ final class Version * @var string * @since 3.8.0 */ - const EXTRA_VERSION = 'dev'; + const EXTRA_VERSION = ''; /** * Release version. @@ -78,7 +78,7 @@ final class Version * @since 3.5 * @deprecated 4.0 Use separated version constants instead */ - const DEV_LEVEL = '14-dev'; + const DEV_LEVEL = '14'; /** * Development status. @@ -86,7 +86,7 @@ final class Version * @var string * @since 3.5 */ - const DEV_STATUS = 'Development'; + const DEV_STATUS = 'Stable'; /** * Build number. @@ -111,7 +111,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '11-December-2019'; + const RELDATE = '17-December-2019'; /** * Release time. @@ -119,7 +119,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '16:08'; + const RELTIME = '15:00'; /** * Release timezone. diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml index 386347fecca..fbf5232724e 100644 --- a/modules/mod_articles_category/mod_articles_category.xml +++ b/modules/mod_articles_category/mod_articles_category.xml @@ -68,6 +68,7 @@ label="MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_LABEL" description="MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_DESC" default="show" + validate="options" > @@ -231,6 +232,7 @@ label="MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_LABEL" description="MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_DESC" default="off" + validate="options" > @@ -244,6 +246,7 @@ description="MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_DESC" default="a.created" showon="date_filtering!:off" + validate="options" > @@ -297,6 +300,7 @@ label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_LABEL" description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_DESC" default="a.title" + validate="options" > @@ -319,6 +323,7 @@ label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_LABEL" description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_DESC" default="ASC" + validate="options" > @@ -336,6 +341,7 @@ label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_LABEL" description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_DESC" default="none" + validate="options" > @@ -352,6 +358,7 @@ description="MOD_ARTICLES_CATEGORY_FIELD_DATEGROUPINGFIELD_DESC" default="created" showon="article_grouping:year,month_year" + validate="options" > @@ -374,6 +381,7 @@ description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_DESC" default="ksort" showon="article_grouping!:none" + validate="options" > @@ -419,6 +427,7 @@ description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_DESC" default="created" showon="show_date:1" + validate="options" > diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml index 1aae7fe84c2..0c1d752d6b0 100644 --- a/modules/mod_articles_news/mod_articles_news.xml +++ b/modules/mod_articles_news/mod_articles_news.xml @@ -192,6 +192,7 @@ label="MOD_ARTICLES_NEWS_FIELD_ORDERING_LABEL" description="MOD_ARTICLES_NEWS_FIELD_ORDERING_DESC" default="a.publish_up" + validate="options" > diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml index afc3077d11c..ce05db98d89 100644 --- a/modules/mod_articles_popular/mod_articles_popular.xml +++ b/modules/mod_articles_popular/mod_articles_popular.xml @@ -66,6 +66,7 @@ label="MOD_POPULAR_FIELD_DATEFILTERING_LABEL" description="MOD_POPULAR_FIELD_DATEFILTERING_DESC" default="off" + validate="options" > @@ -79,6 +80,7 @@ description="MOD_POPULAR_FIELD_DATEFIELD_DESC" default="a.created" showon="date_filtering:range,relative" + validate="options" > diff --git a/modules/mod_tags_popular/mod_tags_popular.xml b/modules/mod_tags_popular/mod_tags_popular.xml index a00053aca8c..96646c1515e 100644 --- a/modules/mod_tags_popular/mod_tags_popular.xml +++ b/modules/mod_tags_popular/mod_tags_popular.xml @@ -50,6 +50,7 @@ label="MOD_TAGS_POPULAR_FIELD_TIMEFRAME_LABEL" description="MOD_TAGS_POPULAR_FIELD_TIMEFRAME_DESC" default="alltime" + validate="options" > @@ -65,6 +66,7 @@ label="MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_LABEL" description="MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_DESC" default="count" + validate="options" >