Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv #14772

Merged
merged 1 commit into from
Jul 10, 2019

Conversation

mlutfy
Copy link
Member

@mlutfy mlutfy commented Jul 10, 2019

Overview

Silly/obvious coding error was causing cv to fail.

https://lab.civicrm.org/dev/drupal/issues/75

@civibot
Copy link

civibot bot commented Jul 10, 2019

(Standard links)

@civibot civibot bot added the master label Jul 10, 2019
@MegaphoneJon
Copy link
Contributor

I've tested this, it fixes the problem. I also reviewed the code and it makes a lot of sense. In theory it could be combined with the if statement above it, but I think it's more readable this way, since the two if statements are covering two different use cases. I'm good with this having a "merge-on-pass" - and since I'm guessing we don't have D8 test coverage yet, that seems like a given.

@eileenmcnaughton eileenmcnaughton merged commit 3dd717f into civicrm:master Jul 10, 2019
@eileenmcnaughton eileenmcnaughton deleted the drupal75 branch July 10, 2019 04:44
@eileenmcnaughton
Copy link
Contributor

dang I merged to master but it needed to be the rc

@eileenmcnaughton
Copy link
Contributor

^^ is 5.15 & 5.16 ports - @mlutfy can you check & merge them?

@cullyRSG
Copy link

cullyRSG commented Sep 5, 2020

(I'm super new at this, go gentle please!)
Looks like this was reverted back somehow. I was getting the same error when calling cv and was able to fix it and run cv without issue by implementing this. Seems as though this never got rolled out. The spot in Drupal8.php is line 658..

@demeritcowboy
Copy link
Contributor

@cullyRSG What cv command are you using since the spot you've linked to is actually a different code block than the one in this PR. In the spot you've linked it's about returning the language not the url. Maybe make a new ticket at https://lab.civicrm.org/dev/drupal/-/issues/new and say what cv command you're using. If drupal isn't bootstrapped yet it wouldn't know what else to return other than null (maybe en_US?).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants