Commit 41c43bfb authored by Stefan Busemann's avatar Stefan Busemann
Browse files

Merge branch 'bugfix/add-patch-for-link-validation' into 'develop'

Add patch for email validation

See merge request !433
parents 22542ec4 adb6498a
Pipeline #11538 passed with stages
in 4 minutes and 27 seconds
......@@ -59,6 +59,11 @@
}
},
"extra": {
"patches": {
"typo3/cms-core": {
"Add basic check for email before validation": "patches/email-validation.diff"
}
},
"typo3/cms": {
"root-dir": "private",
"web-dir": "public",
......
......@@ -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": "efe5c997c9852cc4f3126f7f8bdbbb7e",
"content-hash": "4bd1433c5b5962f510f3fac11cf47f27",
"packages": [
{
"name": "adoy/fastcgi-client",
......@@ -7088,16 +7088,16 @@
},
{
"name": "typo3/cms-composer-installers",
"version": "v3.1.0",
"version": "v3.1.1",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/CmsComposerInstallers.git",
"reference": "f307b64bd6f1309367c58cabb2fc84040b908ab5"
"reference": "3092660e3cb629782b364266985b5b9b1f51f165"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/f307b64bd6f1309367c58cabb2fc84040b908ab5",
"reference": "f307b64bd6f1309367c58cabb2fc84040b908ab5",
"url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/3092660e3cb629782b364266985b5b9b1f51f165",
"reference": "3092660e3cb629782b364266985b5b9b1f51f165",
"shasum": ""
},
"require": {
......@@ -7113,6 +7113,7 @@
},
"require-dev": {
"composer/composer": "1.2.*@dev || 2.0.*@dev",
"friendsofphp/php-cs-fixer": "^2.18",
"overtrue/phplint": "^2.0",
"phpunit/phpunit": "^8.5"
},
......@@ -7156,9 +7157,9 @@
"support": {
"general": "https://typo3.org/support/",
"issues": "https://github.com/TYPO3/CmsComposerInstallers/issues",
"source": "https://github.com/TYPO3/CmsComposerInstallers/tree/v3.1.0"
"source": "https://github.com/TYPO3/CmsComposerInstallers/tree/v3.1.1"
},
"time": "2021-03-02T09:26:00+00:00"
"time": "2021-03-22T12:30:09+00:00"
},
{
"name": "typo3/cms-core",
......
--- Classes/LinkHandling/LegacyLinkNotationConverter.php 2021-03-16 11:15:49.000000000 +0100
+++ Classes/LinkHandling/NewLegacyLinkNotationConverter.php 2021-04-25 20:44:12.000000000 +0200
@@ -71,7 +71,7 @@
// Resolve FAL-api "file:UID-of-sys_file-record" and "file:combined-identifier"
if (stripos($linkParameter, 'file:') === 0) {
$result = $this->getFileOrFolderObjectFromMixedIdentifier(substr($linkParameter, 5));
- } elseif (GeneralUtility::validEmail((string)parse_url($linkParameter, PHP_URL_PATH))) {
+ } elseif (strpos($linkParameter, '@') !== false && GeneralUtility::validEmail((string)parse_url($linkParameter, PHP_URL_PATH))) {
$result['type'] = LinkService::TYPE_EMAIL;
$result['email'] = $linkParameter;
} elseif (strpos($linkParameter, 'tel:') === 0) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment