Skip to content

Merge main into develop after 3.11.5 - #706

Merged
daggerhart merged 4 commits into
developfrom
merge/main-into-develop
Nov 20, 2026
Merged

daggerhart merged 4 commits into
developfrom
merge/main-into-develop

Conversation

@daggerhart

Copy link
Copy Markdown
Collaborator

Merges main into develop after the 3.11.5 release, so develop has the login cookie fix (#702) and main and develop keep a shared history.

Conflicts resolved

  • openid-connect-generic.php, readme.txt: version 3.11.5, with develop's requirements (PHP 8.2, WordPress 6.7).
  • readme.txt, CHANGELOG.md: the 3.12.0 entries followed by the 3.11.5 entries.
  • README.md: regenerated from readme.txt.

Hosts such as Pantheon only pass cookies with WordPress-style names
through to PHP, so the login cookie never reached WordPress and every
login failed with invalid-state (#702). Rename it to
wp-openid_connect_generic_browser, add the
openid-connect-generic-browser-cookie-name filter, and log why a state
check failed.
# Conflicts:
#	CHANGELOG.md
#	README.md
#	openid-connect-generic.php
#	readme.txt
@daggerhart
daggerhart requested a review from mhull as a code owner November 20, 2026 12:02
@daggerhart
daggerhart merged commit b01592d into develop Nov 20, 2026
12 checks passed
@daggerhart
daggerhart deleted the merge/main-into-develop branch November 20, 2026 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant