From 15fd73806dd1843e1f5c14b0a3981429eff37dd7 Mon Sep 17 00:00:00 2001 From: kodiakhq Date: Tue, 22 Oct 2024 03:05:42 +0000 Subject: [PATCH] deploy: 32e9fbce723e9730dcfac4614e7edb2d96b2962c --- classes/rex-media-manager.html | 76 +++++++++---------- .../media_manager/lib/media_manager.php.txt | 5 ++ .../redaxo/src/core/lib/setup/setup.php.txt | 11 ++- 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/classes/rex-media-manager.html b/classes/rex-media-manager.html index fc0fc1b8e..046f6a9da 100644 --- a/classes/rex-media-manager.html +++ b/classes/rex-media-manager.html @@ -453,9 +453,9 @@

@@ -555,9 +555,9 @@

@@ -608,9 +608,9 @@

@@ -654,9 +654,9 @@

@@ -700,9 +700,9 @@

@@ -736,9 +736,9 @@

@@ -772,9 +772,9 @@

@@ -844,9 +844,9 @@

@@ -880,9 +880,9 @@

@@ -916,9 +916,9 @@

@@ -952,9 +952,9 @@

@@ -1026,9 +1026,9 @@

@@ -1058,9 +1058,9 @@

@@ -1094,9 +1094,9 @@

Checks if media is used by this addon.

@@ -1145,9 +1145,9 @@

@@ -1187,9 +1187,9 @@

@@ -1223,9 +1223,9 @@

Set base cache directory for generated images.

@@ -1266,9 +1266,9 @@

@@ -1350,9 +1350,9 @@

diff --git a/files/redaxo-main/redaxo/src/addons/media_manager/lib/media_manager.php.txt b/files/redaxo-main/redaxo/src/addons/media_manager/lib/media_manager.php.txt index 4585e9582..21453a9db 100644 --- a/files/redaxo-main/redaxo/src/addons/media_manager/lib/media_manager.php.txt +++ b/files/redaxo-main/redaxo/src/addons/media_manager/lib/media_manager.php.txt @@ -89,6 +89,11 @@ class rex_media_manager { $this->type = $type; + rex_extension::registerPoint(new rex_extension_point('MEDIA_MANAGER_INIT', $this, [ + 'type' => $type, + 'file' => $this->originalFilename, + ], true)); + if (!$this->isCached()) { $set = $this->effectsFromType($type); $set = rex_extension::registerPoint(new rex_extension_point('MEDIA_MANAGER_FILTERSET', $set, ['rex_media_type' => $type])); diff --git a/files/redaxo-main/redaxo/src/core/lib/setup/setup.php.txt b/files/redaxo-main/redaxo/src/core/lib/setup/setup.php.txt index ed13f01dc..89dd530cb 100644 --- a/files/redaxo-main/redaxo/src/core/lib/setup/setup.php.txt +++ b/files/redaxo-main/redaxo/src/core/lib/setup/setup.php.txt @@ -190,9 +190,9 @@ class rex_setup // Source: https://www.php.net/supported-versions.php, Security Support Until, set to 1st of month $deprecatedVersions = [ - '8.1' => '2024-11-01', - '8.2' => '2025-12-01', - '8.3' => '2026-12-01', + '8.1' => '2025-12-01', + '8.2' => '2026-12-01', + '8.3' => '2027-12-01', ]; $versionNumber = rex_formatter::version(PHP_VERSION, '%s.%s'); @@ -238,6 +238,8 @@ class rex_setup '11.0' => '2024-06-01', '11.1' => '2024-08-01', '11.2' => '2024-11-01', + '11.3' => '2024-05-01', + '11.4' => '2029-05-01', // LTS ]; $versionNumber = rex_formatter::version($dbVersion, '%s.%s'); @@ -257,6 +259,9 @@ class rex_setup '8.1' => '2023-10-01', '8.2' => '2024-01-01', '8.3' => '2024-04-01', + '8.4' => '2032-04-01', + '9.0' => '2024-10-01', + '9.1' => '2025-01-01', ]; $versionNumber = rex_formatter::version($dbVersion, '%s.%s');