Problem/Motivation

It is typical these days to type eg. Lean@Tieto. When the "Convert URLs into links" option is enabled in the filter settings, the link gets converted into an email address even though it is not a complete email address(without ".com" present in them) .

Proposed resolution

Require email address patterns to have at least one subdomain, since emails are usually with subdomain. This allows for the conventional discussion forms like 'working@home today'. Patches available.

Remaining tasks

Patch for both D8 & D7 available.

User interface changes

None

API changes

None

CommentFileSizeAuthor
#104 d7-email-tld-requirement-104.patch3.42 KBdouggreen
#97 d8-email-tld-requirement-97.patch3.42 KBmark_fullmer
#97 interdiff-2016739-92-97.txt3.47 KBmark_fullmer
#92 interdiff-2016739-91-92.txt2.38 KBmohit_aghera
#92 d8-email-tld-requirement-92.patch3.18 KBmohit_aghera
#91 d8-email-tld-requirement-91.patch828 bytesNikolaAt
#86 2016739-86.patch2.8 KBayushmishra206
#83 test-mail-link-druapl9.png27.26 KBamietpatial
#81 Screen Shot 2020-07-23 at 6.09.05 PM.png283.93 KBtanubansal
#81 Screen Shot 2020-07-23 at 6.08.47 PM.png326.62 KBtanubansal
#76 d7-require-tld-for-mailto-links-2016739-76.patch2.86 KBrichardbporter
#76 interdiff_72-76.txt2.45 KBrichardbporter
#75 interdiff_71-73.txt2.36 KBrichardbporter
#75 d8-require-tld-for-mailto-links-2016739-73.patch2.8 KBrichardbporter
#72 interdiff_49-72.txt703 bytesrichardbporter
#72 require-subdomain-for-mailto-links-2016739-72.patch792 bytesrichardbporter
#71 interdiff_57-71.txt721 bytesrichardbporter
#71 require-subdomain-for-mailto-links-2016739-71.patch816 bytesrichardbporter
#57 2016739-57.patch816 bytesrakesh.gectcr
#49 drupal-require_subdomain_for_mailto_links-2016739-49.patch786 bytesrichardbporter
#37 email-filter-links-2016739.37.patch2.33 KBlarowlan
#37 interdiff.txt1.83 KBlarowlan
#33 email-filter-links-2016739.33.patch2.98 KBlarowlan
#30 email-filter-links-2016739.pass_.patch2.95 KBlarowlan
#30 email-filter-links-2016739.fail_.patch2.09 KBlarowlan
#24 links-after.png26.9 KBrteijeiro
#24 links-before.png27.63 KBrteijeiro
#23 drupal-require_subdomain_for_mailto_links-2016739-23.patch880 bytesafox
#23 D8_email_subdomain_test.png48.18 KBafox
#11 drupal-require_subdomain_for_mailto_links-2016739-11.patch1.14 KBafox
#13 Test Lean @ Domain functionality | 7x.dev 2013-08-15 10-05-45.jpg203.03 KBwroxbox
#9 Test Lean @ Domain functionality | 7x.dev 2013-08-14 22-53-20.jpg94.16 KBwroxbox
#9 filter-2016739-9.patch689 byteswroxbox
#5 filter-2016739-1.patch700 bytesaalamaki
#3 filter-2016739-1.patch681 bytesaalamaki
#1 filter-2016739-1.patch681 bytesaalamaki
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

aalamaki’s picture

FileSize
681 bytes

The following patch fixes the issue by checking for a domain suffix and converting only those that have it into a email link. Even this is not always foolproof but it fixes at least some issues.

aalamaki’s picture

Status: Active » Needs review
aalamaki’s picture

FileSize
681 bytes

Please ignore the previous patch; it will fail, did diff in wrong order. The following patch will work.

Status: Needs review » Needs work

The last submitted patch, filter-2016739-1.patch, failed testing.

aalamaki’s picture

FileSize
700 bytes

Trying again...

aalamaki’s picture

Status: Needs work » Needs review

Status: Needs review » Needs work

The last submitted patch, filter-2016739-1.patch, failed testing.

aalamaki’s picture

mmm what's wrong with the patch...works fine on my local, clean drupal installation

wroxbox’s picture

Status: Needs work » Needs review
FileSize
689 bytes
94.16 KB

Here is the filter patched and re-tested locally. Validated it is working as should. Lets see what the bot thinks.

With the patch applied

Status: Needs review » Needs work

The last submitted patch, filter-2016739-9.patch, failed testing.

afox’s picture

Status: Reviewed & tested by the community » Needs work
FileSize
1.14 KB

The issue has a valid point, but as this goes against the standard, it should be a decision for the maintainer whether or not this should go in. I see few things to note here:

  • In the described case, where foo@bar is used, "bar" is a fully valid domain name by standard, even without the TLD.
  • It might be required for example when sharing information about local environments. Example would be where a link to access local domain resources is shared (i.e. ftp://foo@bar/path/to/awesome). In this case a link is expected.
  • However, it's true that the usage of "@" is becoming more common. Example "I'm meeting Johnny@home". In this case the link is not wished.
  • Emails are rarely used without subdomains.

My suggestion:
Target only email addresses, requiring them to have a subdomain. This won't then affect URL's and is rarely used. I've attached a patch which sets a subdomain to be matched.

afox’s picture

Status: Needs work » Needs review
wroxbox’s picture

Status: Needs review » Reviewed & tested by the community
FileSize
203.03 KB

It seams working with the patch applied.

With the patch applied

I would give +1 for this.

fullerja’s picture

Patch in 11 works for me

PavanL’s picture

Title: "Convert URLs into links": Links with @ are converted into email addresses even if there is no domain suffix present » Links with "@" are converted into email addresses even if there is no domain suffix present.
Issue summary: View changes
PavanL’s picture

Issue summary: View changes
afox’s picture

@PavanL thank you for your participation, but please don't modify the original post unless it's exceptionally unclear in what it's saying. Your changes were good and reasonable, but it isn't really good practice to rewrite somebody else's issue. Also, how in the world this was changed to 'needs work'...?

afox’s picture

Status: Needs work » Reviewed & tested by the community
PavanL’s picture

Issue summary: View changes
David_Rothstein’s picture

Version: 7.22 » 8.x-dev
Status: Reviewed & tested by the community » Needs review
Issue tags: +Needs backport to D7

Like #11, I'm not sure about this one (that comment contains a great summary of the pros and cons of such a change).

Either way, would need to go in Drupal 8 first, though.

tregismoreira’s picture

jelo’s picture

Patch from #11 works for me in D7. I think afox makes a very logical suggestion to only target email patterns which will keep the bulk of the existing functionality as is. Any chance to get this committed?

afox’s picture

@jelo you're right. We first need to get the D8 version working. So here's a D8-version with same changes (seemed to work nicely).

rteijeiro’s picture

Issue summary: View changes
Status: Needs review » Reviewed & tested by the community
FileSize
27.63 KB
26.9 KB

Great job @aFox!

BEFORE

AFTER

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 23: drupal-require_subdomain_for_mailto_links-2016739-23.patch, failed testing.

afox’s picture

Status: Needs work » Reviewed & tested by the community

Testbot apparently had a glitch. Now passed.

alexpott’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs tests

I think we should be adding to the files used in FilterUnitTest::testUrlFilterContent() to test this

Sutharsan’s picture

This (failing) URL lead me to this issue:
https://www.google.be/maps/place/Rue+de+la+Victoire+39,+1060+Saint-Gilles/@50.831321,4.3468107,17z/data=!3m1!4b1!4m2!3m1!1s0x47c3c4668ae4d069:0xaf2df9dc39d8f03a?hl=fr

The patch fixes the filtering of this URL in Drupal 8. However a quick backport of #23 to Drupal 7 did not. So there have been more improvements to this function compared to D7. I propose to backport the whole_filter_url() code, not just the patch.

larowlan’s picture

Status: Needs work » Needs review
Issue tags: -Needs tests
FileSize
2.09 KB
2.95 KB

Here's a failing test

The last submitted patch, 30: email-filter-links-2016739.fail_.patch, failed testing.

jibran’s picture

Status: Needs review » Reviewed & tested by the community

Manually tested works fine even for the strings like now@home. @larowlan is this string worth adding to tests to check the edge case.

larowlan’s picture

great idea jibran.
changed test line to

see you tomorrow@work or later@home.
jibran’s picture

RTBC++

Wim Leers’s picture

Status: Reviewed & tested by the community » Needs work

Sorry, two nits.

  1. +++ b/core/modules/filter/filter.module
    @@ -534,8 +534,13 @@ function _filter_url($text, $filter) {
    +  // a subdomain match. This allows patterns like foo@bar in text without
    

    Hrm, not a subdomain, but rather a TLD? See https://en.wikipedia.org/wiki/Domain_name#Second-level_and_lower_level_d....

  2. +++ b/core/modules/filter/filter.module
    @@ -534,8 +534,13 @@ function _filter_url($text, $filter) {
    +  // being converted to a mailto -link.
    

    s/mailto -link/mailto-link/
    or
    s/mailto -link/mailto link/

alexpott’s picture

+++ b/core/modules/filter/tests/filter.url-input.txt
@@ -30,7 +32,7 @@ The old URL filter has problems with <a title="kind of link www.example.com with
 <!-- <p>This url http://www.test.com is
- inside a comment containing newlines and 
+ inside a comment containing newlines and
 <em>html</em> tags.</p> -->
 
-This is the end!
\ No newline at end of file
+This is the end!

+++ b/core/modules/filter/tests/filter.url-output.txt
@@ -30,7 +32,7 @@ The old URL filter has problems with <a title="kind of link www.example.com with
 <!-- <p>This url http://www.test.com is
- inside a comment containing newlines and 
+ inside a comment containing newlines and
 <em>html</em> tags.</p> -->
 
-This is the end!
\ No newline at end of file
+This is the end!

Let's not change this here - it's out of scope and since this is testing filters potentially significant.

larowlan’s picture

Status: Needs work » Needs review
FileSize
1.83 KB
2.33 KB

Fixes #35 and #36

#36 was my editor settings, but agree, could be significant with filters.

jibran’s picture

Status: Needs review » Reviewed & tested by the community

All the feedback is addressed back to RTBC.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 37: email-filter-links-2016739.37.patch, failed testing.

jibran’s picture

Seems unrelated Updates for Contrib module one Other LocaleUpdateTest.php 144 Drupal\locale\Tests\LocaleUpdateTest->testUpdateImportSourceRemote()

Status: Needs work » Needs review
jibran’s picture

Status: Needs review » Reviewed & tested by the community

Back to RTBC.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 37: email-filter-links-2016739.37.patch, failed testing.

jibran’s picture

FAILED: [[SimpleTest]]: [PHP 5.4 MySQL] 91,590 pass(es), 2,654 fail(s), and 1,057 exception(s). this can't be true retesting.

Status: Needs work » Needs review
jibran’s picture

Status: Needs review » Reviewed & tested by the community

Back to RTBC.

alexpott’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: -Needs backport to D7

I think this is a good change. It is sensible to say that local domain names with no TLD are excluded because Drupal is about publishing content - but I think we need further tests. jsmith@[192.168.2.1] is a valid email address. See https://en.wikipedia.org/wiki/Email_address#Examples.

jibran’s picture

Thanks for the suggestion @alexpott. We'll fix that as well. I think you wanted to add needs tests tag. We do have this issue in D7 as well that is why we want to back port it. Feel free to clarify yourself re-adding the tag for now.

richardbporter’s picture

Patch in #11 failed to apply cleanly against Drupal 7.41. Re-rolled.

Version: 8.0.x-dev » 8.1.x-dev

Drupal 8.0.6 was released on April 6 and is the final bugfix release for the Drupal 8.0.x series. Drupal 8.0.x will not receive any further development aside from security fixes. Drupal 8.1.0-rc1 is now available and sites should prepare to update to 8.1.0.

Bug reports should be targeted against the 8.1.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.2.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Screenack’s picture

I'm confirming that #49 works as expected against Drupal 7.43

Version: 8.1.x-dev » 8.2.x-dev

Drupal 8.1.9 was released on September 7 and is the final bugfix release for the Drupal 8.1.x series. Drupal 8.1.x will not receive any further development aside from security fixes. Drupal 8.2.0-rc1 is now available and sites should prepare to upgrade to 8.2.0.

Bug reports should be targeted against the 8.2.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.3.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.2.x-dev » 8.3.x-dev

Drupal 8.2.6 was released on February 1, 2017 and is the final full bugfix release for the Drupal 8.2.x series. Drupal 8.2.x will not receive any further development aside from critical and security fixes. Sites should prepare to update to 8.3.0 on April 5, 2017. (Drupal 8.3.0-alpha1 is available for testing.)

Bug reports should be targeted against the 8.3.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.4.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

nkraft’s picture

So patches for this issue were tested years ago, and I'm still struggling with this issue?

Maybe I can simplify the argument: nearly all of us know how to make a valid email link manually. Many content editors (ie, clients) do not. This filter is for those people.

Therefore, the filter should only convert email links if they satisfy the average standard email address. If someone has a weird email address WITHOUT a top level domain at the end (ex., jsmith@[192.168.2.1] ) -- those instances can be made into mailto links manually when the filter does not catch them. HOWEVER -- converting everything with an '@' sign in the middle of it to a mailto: link does not make sense. 'working@home' is never meant to be a valid email address; and you can not manually change this if the filter is turned on.

Can we please get this patch into D8 in the near future? This is the sort of stuff that is making me go crazy while working with D8.

nkraft’s picture

Alternately -- if we could split out email conversion from regular URL conversion -- that would allow me to turn this faulty feature off. I'd settle for either option. Thanks, and I appreciate all the hours volunteers put into this. I was just very frustrated to research this issue only to find it had been discussed, patches made, and then it got effectively killed 2 years ago.

rakesh.gectcr’s picture

Version: 8.3.x-dev » 8.4.x-dev

Let me try to roll out against 8.4.x

rakesh.gectcr’s picture

rakesh.gectcr’s picture

Status: Needs work » Needs review

The last submitted patch, 49: drupal-require_subdomain_for_mailto_links-2016739-49.patch, failed testing.

Status: Needs review » Needs work

The last submitted patch, 57: 2016739-57.patch, failed testing.

jelo’s picture

I agree with #54. It seems important to get this committed...

Version: 8.4.x-dev » 8.5.x-dev

Drupal 8.4.0-alpha1 will be released the week of July 31, 2017, which means new developments and disruptive changes should now be targeted against the 8.5.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.5.x-dev » 8.6.x-dev

Drupal 8.5.0-alpha1 will be released the week of January 17, 2018, which means new developments and disruptive changes should now be targeted against the 8.6.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

afinnarn’s picture

On Drupal 7.57 I get "error: corrupt patch at line 17" when trying to apply the patch. I will attempt to re-roll...

afinnarn’s picture

nevermind...I corrupted the patch myself.

Version: 8.6.x-dev » 8.7.x-dev

Drupal 8.6.0-alpha1 will be released the week of July 16, 2018, which means new developments and disruptive changes should now be targeted against the 8.7.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

isramv’s picture

I can confirm that after 3 years, patch #49 works on Drupal 7...

Fabianx’s picture

I would be open to commit / fix this in Drupal 7, but it needs to be fixed in Drupal 8 first.

Version: 8.7.x-dev » 8.8.x-dev

Drupal 8.7.0-alpha1 will be released the week of March 11, 2019, which means new developments and disruptive changes should now be targeted against the 8.8.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

darkodev’s picture

#49 applies cleanly to 7.65

richardbporter’s picture

Looks like the + symbol got removed from the URL pattern regex which I think is why the tests were failing. I added that back and fixed a typo in the comments.

A new test for this functionality would be nice but I'm having trouble debugging that kernel test at the moment.

richardbporter’s picture

Re-rolled the D7 patch in 49 with the same changes.

richardbporter’s picture

Status: Needs work » Needs review
richardbporter’s picture

Assigned: Unassigned » richardbporter
Status: Needs review » Active
richardbporter’s picture

Made some adjustments based on #35and #28.

richardbporter’s picture

Re-rolled again for D7 with the same changes.

Also, it appears I overlooked the work already done in #37. Apologies.

richardbporter’s picture

Status: Active » Needs review

Version: 8.8.x-dev » 8.9.x-dev

Drupal 8.8.0-alpha1 will be released the week of October 14th, 2019, which means new developments and disruptive changes should now be targeted against the 8.9.x-dev branch. (Any changes to 8.9.x will also be committed to 9.0.x in preparation for Drupal 9’s release, but some changes like significant feature additions will be deferred to 9.1.x.). For more information see the Drupal 8 and 9 minor version schedule and the Allowed changes during the Drupal 8 and 9 release cycles.

darkodev’s picture

Patch at #76 working here (with the plus sign).

Where are we with the D8 blocker for the D7 working patch to make it into a release?

Any chance for 7.68?

Thanks for everyone's work on this.

Version: 8.9.x-dev » 9.1.x-dev

Drupal 8.9.0-beta1 was released on March 20, 2020. 8.9.x is the final, long-term support (LTS) minor release of Drupal 8, which means new developments and disruptive changes should now be targeted against the 9.1.x-dev branch. For more information see the Drupal 8 and 9 minor version schedule and the Allowed changes during the Drupal 8 and 9 release cycles.

tanubansal’s picture

After enabling 'Convert URLs into links' for Basic HTML on 9.1, I have created a basic page and added both the links.
Its showing text as a link if there is no domain suffix.
Can we have a patch fix for 9.1?

Kasey_MK’s picture

d8-require-tld-for-mailto-links-2016739-73.patch in #75 works for us, thank you!

amietpatial’s picture

Status: Needs review » Reviewed & tested by the community
FileSize
27.26 KB

#75 works for me too, thank you!

Attached is the screenshot:

quietone’s picture

Status: Reviewed & tested by the community » Needs work

Noticed that this is tagged 'Needs tests' but it also RTBC, it can't be both. I looked at the patch and indeed there are no tests. The latest patch is for 8.8.x. It needs to be against 9.1.x.

Setting NW for tests and to have a patch for 9.1.x.

ayushmishra206’s picture

ayushmishra206’s picture

Assigned: ayushmishra206 » Unassigned
Status: Needs work » Needs review
FileSize
2.8 KB

Rerolled for 9.1. Please review

ayushmishra206’s picture

Status: Needs review » Needs work

Setting back to NW for tests.

alexpott’s picture

+++ b/core/modules/filter/filter.module
@@ -503,7 +503,11 @@ function _filter_url($text, $filter) {
-  $url_pattern = "[\p{L}\p{M}\p{N}._+-]{1,254}@(?:$domain)";
+  // Mail domain pattern differs from the general domain pattern by requiring
+  // a TLD match. This allows patterns like foo@bar in text without
+  // being converted to a mailto link.
+  $email_domain = '(?:[A-Za-z0-9._+-]+\.)+[A-Za-z]{2,64}\b';
+  $url_pattern = "[A-Za-z0-9._+-]{1,254}@(?:$email_domain)";

This change is a regression. #1657886: Filter "Convert URLs into links" doesn't support multilingual web addresses changed this to allow multilingual characters. See https://en.wikipedia.org/wiki/International_email

Version: 9.1.x-dev » 9.2.x-dev

Drupal 9.1.0-alpha1 will be released the week of October 19, 2020, which means new developments and disruptive changes should now be targeted for the 9.2.x-dev branch. For more information see the Drupal 9 minor version schedule and the Allowed changes during the Drupal 9 release cycle.

Version: 9.2.x-dev » 9.3.x-dev

Drupal 9.2.0-alpha1 will be released the week of May 3, 2021, which means new developments and disruptive changes should now be targeted for the 9.3.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

NikolaAt’s picture

Added a patch that keeps the current format of the domain pattern (multilingual support) and make a change of the regex, so if no dot is added after the @, text will not be transformed to mailto link

mohit_aghera’s picture

Status: Needs work » Needs review
FileSize
3.18 KB
2.38 KB

Issue history has many patches in the past where test cases have been added.
I've clubbed together test cases and created a patch.
Test cases are passing on local.

mark_fullmer’s picture

Status: Needs review » Reviewed & tested by the community

The patch in #92 works as designed, and tests pass, and still cleanly applies to the 9.3.x-dev branch. Marking this as RTBC, accordingly, with the desire that this is next reviewed by the core maintainers.

justcaldwell’s picture

+1 for the RTBC (and hopefully getting it reviewed/committed). We've been using this for months now with no issue.

alexpott’s picture

Status: Reviewed & tested by the community » Needs work

The change to the regex looks good in my opinion. I might assign both $domain and $email_domain at the same point in the code so if you change one you'll consider the other.

+++ b/core/modules/filter/tests/filter.url-input.txt
@@ -29,11 +30,12 @@ The old URL filter has problems with <a title="kind of link www.example.com with
 <!-- <p>This url http://www.test.com is
- inside a comment containing newlines and 
+ inside a comment containing newlines and
 <em>html</em> tags.</p> -->
 
-This is the end!
\ No newline at end of file
+This is the end!

+++ b/core/modules/filter/tests/filter.url-output.txt
@@ -29,11 +30,12 @@ The old URL filter has problems with <a title="kind of link www.example.com with
 <!-- <p>This url http://www.test.com is
- inside a comment containing newlines and 
+ inside a comment containing newlines and
 <em>html</em> tags.</p> -->
 
-This is the end!
\ No newline at end of file
+This is the end!

These changes might be automatically occurring due to IDE settings but we should not be making them here. It's out-of-scope and I'm not sure they are correct.

alexpott’s picture

  // Mail domain pattern differs from the general domain pattern by requiring,
  // a TLD match. 

Also not sure about this text. Firstly the use of the acronym without it being defined earlier and also the comma is incorrect.

mark_fullmer’s picture

Thanks for the review, alexpott!

The attached patch addresses comments in 95 & 96:
1. The definition of the email domain is now adjacent to the generic domain pattern.
2. The comment text clarifies how the email domain differs.
3. The newlines errroneously added to .txt files in 92 are excised.

Jeff Cardwell’s picture

Status: Needs review » Reviewed & tested by the community

Comments from #95 and #96 seem to be addressed. Setting back to RTBC.

alexpott’s picture

Status: Reviewed & tested by the community » Fixed
Issue tags: -Needs tests

Committed 8ff4d48 and pushed to 9.3.x. Thanks!
Committed f7ccf32 and pushed to 9.2.x. Thanks!

Backported to 9.2.x because this is a bug and the implementation only affects mailto links so the scope is small. The use something@something to mean things like ladygaga@oscars feels way more commonplace than it was when this issue was opened.

In order for this issue to be backported to Drupal 7 the current policy is to open a new issue.

  • alexpott committed 8ff4d48 on 9.3.x
    Issue #2016739 by richardbporter, larowlan, aalamaki, afox, wroxbox,...
alexpott’s picture

Version: 9.3.x-dev » 9.2.x-dev

  • alexpott committed f7ccf32 on 9.2.x
    Issue #2016739 by richardbporter, larowlan, aalamaki, afox, wroxbox,...

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.

douggreen’s picture

@Fabianx now that this is in D9, can we back port to D7 please. There's a long history here. While the patch in #49 works, attached is a new D7 re-roll with all the changes that made it into D9.

darkodev’s picture

#104 @douggreen, as per, "In order for this issue to be backported to Drupal 7 the current policy is to open a new issue" in #99 and because you have a proposed patch, can you open a new issue to backport and reference this as related issue. Cheers.