diff --git a/composer.json b/composer.json index 90d352ef..18539f40 100644 --- a/composer.json +++ b/composer.json @@ -251,9 +251,6 @@ "drupal/address": { "Integrate Address with Search API https://www.drupal.org/project/address/issues/2812659": "https://www.drupal.org/files/issues/2020-11-02/integrate-address-searchapi-2812659-56.patch" }, - "drupal/flag": { - "remove flag hooks to allow site to be accessible again https://www.drupal.org/project/flag/issues/3200806": "./patches/flag-commenthooks.patch" - }, "drupal/mailjet": { "DrupalmailjetControllerMailjetRegisterController::redirectRegister() does not exist https://www.drupal.org/project/mailjet/issues/3450474": "https://www.drupal.org/files/issues/2024-05-29/mailjet-15615025-5.patch", "Error: Class MailjetTools/MailjetApi not found in Drupal/mailjet/Form/MailjetApiForm->submitForm() https://www.drupal.org/project/mailjet/issues/3464788":"https://www.drupal.org/files/issues/2024-08-20/mailjetApiForm_use_mailjettools_mailjetapi.patch", @@ -319,6 +316,9 @@ ".editorconfig": "../.editorconfig", ".gitattributes": "../.gitattributes" } + }, + "drupal/flag": { + "remove flag hooks to allow site to be accessible again https://www.drupal.org/project/flag/issues/3200806": "./patches/flag-commenthooks.patch" } } } diff --git a/composer.lock b/composer.lock index 00ee93ff..7dee697d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fedb5cfa71eca8fbb16f0139dffe039d", + "content-hash": "f24db1d651c2a77f5e9b202863413098", "packages": [ { "name": "algolia/places", @@ -1962,16 +1962,16 @@ }, { "name": "dompdf/php-font-lib", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/dompdf/php-font-lib.git", - "reference": "991d6a954f6bbd7e41022198f00586b230731441" + "reference": "6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/991d6a954f6bbd7e41022198f00586b230731441", - "reference": "991d6a954f6bbd7e41022198f00586b230731441", + "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d", + "reference": "6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d", "shasum": "" }, "require": { @@ -2001,9 +2001,9 @@ "homepage": "https://github.com/dompdf/php-font-lib", "support": { "issues": "https://github.com/dompdf/php-font-lib/issues", - "source": "https://github.com/dompdf/php-font-lib/tree/1.0.0" + "source": "https://github.com/dompdf/php-font-lib/tree/1.0.1" }, - "time": "2024-04-29T13:40:38+00:00" + "time": "2024-12-02T14:37:59+00:00" }, { "name": "dompdf/php-svg-lib", @@ -7197,26 +7197,26 @@ }, { "name": "drupal/filter_perms", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/filter_perms.git", - "reference": "2.0.1" + "reference": "2.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/filter_perms-2.0.1.zip", - "reference": "2.0.1", - "shasum": "76949486b0a730c1fdfd9a8d773a3a96d2e0de7b" + "url": "https://ftp.drupal.org/files/projects/filter_perms-2.0.2.zip", + "reference": "2.0.2", + "shasum": "da352ab7bf56429caba3029509afde72e917fcd9" }, "require": { - "drupal/core": "^9.0 || ^10.0 || ^11" + "drupal/core": "^10.3 || ^11 || ^12" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.1", - "datestamp": "1722444219", + "version": "2.0.2", + "datestamp": "1745993059", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7229,7 +7229,7 @@ ], "authors": [ { - "name": "cYu", + "name": "cyu", "homepage": "https://www.drupal.org/user/202205" }, { @@ -7248,6 +7248,10 @@ "name": "mgbellaire", "homepage": "https://www.drupal.org/user/1831932" }, + { + "name": "scott_euser", + "homepage": "https://www.drupal.org/user/3267594" + }, { "name": "willzyx", "homepage": "https://www.drupal.org/user/1043862" @@ -7262,26 +7266,26 @@ }, { "name": "drupal/flag", - "version": "4.0.0-beta5", + "version": "4.0.0-beta7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/flag.git", - "reference": "8.x-4.0-beta5" + "reference": "8.x-4.0-beta7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/flag-8.x-4.0-beta5.zip", - "reference": "8.x-4.0-beta5", - "shasum": "da40eefe0f3a5603fff25f8f4626c462bb75cf7a" + "url": "https://ftp.drupal.org/files/projects/flag-8.x-4.0-beta7.zip", + "reference": "8.x-4.0-beta7", + "shasum": "6f74fcaec0db3c54934cdf8f25acb67c0c2d7f07" }, "require": { - "drupal/core": "^9.1 || ^10 || ^11" + "drupal/core": "^10.3 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-4.0-beta5", - "datestamp": "1724579446", + "version": "8.x-4.0-beta7", + "datestamp": "1743851261", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -7338,27 +7342,30 @@ }, { "name": "drupal/flag_lists", - "version": "4.0.2", + "version": "4.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/flag_lists.git", - "reference": "4.0.2" + "reference": "4.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/flag_lists-4.0.2.zip", - "reference": "4.0.2", - "shasum": "708d024dd5c75fe9eea9998350004a7c0ee634f8" + "url": "https://ftp.drupal.org/files/projects/flag_lists-4.0.3.zip", + "reference": "4.0.3", + "shasum": "e938391f54de3eb668b9de520bb34543c40a74c0" }, "require": { - "drupal/core": "^9 || ^10", + "drupal/core": "^9 || ^10 || ^11", "drupal/flag": "^4.0" }, + "require-dev": { + "drupal/action": "*" + }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.2", - "datestamp": "1712137036", + "version": "4.0.3", + "datestamp": "1739876841", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/web/modules/custom/materio_flag/src/Controller/MaterioFlagActionsController.php b/web/modules/custom/materio_flag/src/Controller/MaterioFlagActionsController.php index 49b1c44b..1498d531 100644 --- a/web/modules/custom/materio_flag/src/Controller/MaterioFlagActionsController.php +++ b/web/modules/custom/materio_flag/src/Controller/MaterioFlagActionsController.php @@ -61,7 +61,7 @@ class MaterioFlagActionsController extends ActionLinkController { // $nid = $node->id(); // call the parent flag function - $this->flag($flag, $id, $flagcollid); + $this->flag($flag, $id, 'default', $flagcollid); // // OR rewrite it entirely // $entity = $this->flagService->getFlaggableById($flag, $nid);