diff --git a/administrator/components/com_actionlogs/src/Controller/DisplayController.php b/administrator/components/com_actionlogs/src/Controller/DisplayController.php index 7493052e2de1..999dde7fe4aa 100644 --- a/administrator/components/com_actionlogs/src/Controller/DisplayController.php +++ b/administrator/components/com_actionlogs/src/Controller/DisplayController.php @@ -17,7 +17,7 @@ // phpcs:enable PSR1.Files.SideEffects /** - * Plugins display controller. + * Actionlogs display controller. * * @since 4.0.0 */ diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml index a25de44730f6..5d949e6a4341 100644 --- a/administrator/components/com_fields/forms/field.xml +++ b/administrator/components/com_fields/forms/field.xml @@ -90,7 +90,7 @@ name="default_value" type="textarea" label="COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL" - filter="raw" + filter="safehtml" /> where($db->quoteName('a.id') . ' = :search') - ->bind(':id', $search, ParameterType::INTEGER); + ->bind(':search', $search, ParameterType::INTEGER); } else { $search = '%' . str_replace(' ', '%', trim($search)) . '%'; $query->where($db->quoteName('a.title') . ' LIKE :search') diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 6189242ecc04..4bcba1e808c7 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.6 + 4.4.7 2024-07 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index f5709bcc0fbb..ac08de35905e 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.6 + 4.4.7 2024-07 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index b00c3299a15f..fd3629a487f6 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.4.6-rc2-dev + 4.4.7-dev 2024-07 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 35274e3bd127..765295bb1b86 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 4.4.6.1 + 4.4.7.1 2024-07 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index d3fb2d29c805..11bfab02da3d 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.6 + 4.4.7 2024-07 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index cd200124b38f..84978b6b1d3e 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.6 + 4.4.7 2024-07 Joomla! Project admin@joomla.org diff --git a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js index 1618bd00af6d..b8b4f08fef22 100644 --- a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js +++ b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js @@ -239,8 +239,8 @@ window.customElements.define('joomla-field-fancy-select', class extends HTMLElem // Create and add new this.choicesInstance.setChoices([{ - value: this.newItemPrefix + event.target.value, - label: event.target.value, + value: new DOMParser().parseFromString(this.newItemPrefix + event.target.value, 'text/html').body.textContent, + label: new DOMParser().parseFromString(event.target.value, 'text/html').body.textContent, selected: true, customProperties: { value: event.target.value, // Store real value, just in case diff --git a/components/com_wrapper/tmpl/wrapper/default.xml b/components/com_wrapper/tmpl/wrapper/default.xml index 7c04e6653ac4..7f8f5a304bcf 100644 --- a/components/com_wrapper/tmpl/wrapper/default.xml +++ b/components/com_wrapper/tmpl/wrapper/default.xml @@ -16,6 +16,8 @@ diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index daf99be4bc62..4c10f25a08b9 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 4.4.6 + 4.4.7 2024-07 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 265f20d3ba98..82887e08e6c0 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.6 + 4.4.7 2024-07 Joomla! Project admin@joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index c0381b7c5161..e1755842d0f4 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.6 + 4.4.7 2024-07 Joomla! Project admin@joomla.org diff --git a/libraries/src/Console/TasksListCommand.php b/libraries/src/Console/TasksListCommand.php index 25014165b278..0f78d3cd2bcb 100644 --- a/libraries/src/Console/TasksListCommand.php +++ b/libraries/src/Console/TasksListCommand.php @@ -72,15 +72,22 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in $tasks = array_map( function (\stdClass $task): array { $enabled = $task->state === 1; - $nextExec = Factory::getDate($task->next_execution, 'UTC'); - $due = $enabled && $task->taskOption && Factory::getDate('now', 'UTC') > $nextExec; + $rule = json_decode($task->execution_rules); + + if ($rule->{'rule-type'} === 'manual') { + $nextRun = 'Manual'; + } else { + $nextExec = Factory::getDate($task->next_execution, 'UTC'); + $due = $enabled && $task->taskOption && Factory::getDate('now', 'UTC') > $nextExec; + $nextRun = $due ? 'DUE!' : $nextExec->toRFC822(); + } return [ 'id' => $task->id, 'title' => $task->title, 'type' => $task->safeTypeTitle, 'state' => $task->state === 1 ? 'Enabled' : ($task->state === 0 ? 'Disabled' : 'Trashed'), - 'next_execution' => $due ? 'DUE!' : $nextExec->toRFC822(), + 'next_execution' => $nextRun, ]; }, $this->getTasks() @@ -105,7 +112,7 @@ private function getTasks(): array return $scheduler->fetchTaskRecords( ['state' => '*'], - ['ordering' => 'a.title', 'select' => 'a.id, a.title, a.type, a.state, a.next_execution'] + ['ordering' => 'a.title', 'select' => 'a.id, a.title, a.type, a.state, a.next_execution, a.execution_rules'] ); } diff --git a/libraries/src/Form/Field/AccessiblemediaField.php b/libraries/src/Form/Field/AccessiblemediaField.php index 2ab1b18d489a..033f77b445d1 100644 --- a/libraries/src/Form/Field/AccessiblemediaField.php +++ b/libraries/src/Form/Field/AccessiblemediaField.php @@ -195,6 +195,9 @@ public function setup(\SimpleXMLElement $element, $value, $group = null) preview="$this->preview" preview_width="$this->previewWidth" preview_height="$this->previewHeight" + schemes="http,https,ftp,ftps,data,file" + validate="url" + relative="true" /> ', '> ', $text); $text = str_replace([' ', ' '], ' ', $text); $text = FrameworkStringHelper::trim(preg_replace('#\s+#mui', ' ', $text)); - // Strip the tags from the input and decode entities. + // Strip tags from the input. $text = strip_tags($text); - $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8'); // Remove remaining extra spaces. $text = str_replace(' ', ' ', $text); diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 5d06cafb518e..7cc56a9df0a4 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -55,7 +55,7 @@ final class Version * @var integer * @since 3.8.0 */ - public const PATCH_VERSION = 6; + public const PATCH_VERSION = 7; /** * Extra release version info. @@ -66,7 +66,7 @@ final class Version * @var string * @since 3.8.0 */ - public const EXTRA_VERSION = 'rc2-dev'; + public const EXTRA_VERSION = 'dev'; /** * Development status. @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '4-July-2024'; + public const RELDATE = '9-July-2024'; /** * Release time. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '18:01'; + public const RELTIME = '16:01'; /** * Release timezone. diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml index f998114851b4..d7db7e4a8151 100644 --- a/modules/mod_wrapper/mod_wrapper.xml +++ b/modules/mod_wrapper/mod_wrapper.xml @@ -25,7 +25,9 @@
diff --git a/package.json b/package.json index 5f49e3baf389..de22c7687e3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "joomla", - "version": "4.4.6", + "version": "4.4.7", "description": "Joomla CMS", "license": "GPL-2.0-or-later", "repository": { @@ -111,4 +111,4 @@ "stylelint-order": "^5.0.0", "stylelint-scss": "^4.7.0" } -} +} \ No newline at end of file diff --git a/plugins/content/vote/tmpl/rating.php b/plugins/content/vote/tmpl/rating.php index 2c1287628f0d..e0f2a78b290c 100644 --- a/plugins/content/vote/tmpl/rating.php +++ b/plugins/content/vote/tmpl/rating.php @@ -79,17 +79,17 @@ ?>