diff --git a/1 b/1 new file mode 100644 index 0000000000000000000000000000000000000000..258f8b9a897bebda9fb9612a0e1efaffbcf2d7ff --- /dev/null +++ b/1 @@ -0,0 +1,7 @@ +Merge branch 'simplesamlphp-1.19' of https://github.com/simplesamlphp/simplesamlphp into simplesamlphp-1.19 + +# Please enter a commit message to explain why this merge is necessary, +# especially if it merges an updated upstream into a topic branch. +# +# Lines starting with '#' will be ignored, and an empty message aborts +# the commit. diff --git a/modules/saml/lib/SP/LogoutStore.php b/modules/saml/lib/SP/LogoutStore.php index 7bcc512c41d0b725217073e0ec24e5a7314a521d..aa7de61847023fff92cd19061c9af4f20380e489 100644 --- a/modules/saml/lib/SP/LogoutStore.php +++ b/modules/saml/lib/SP/LogoutStore.php @@ -124,9 +124,10 @@ class LogoutStore 'ALTER TABLE ' . $store->prefix . '_saml_LogoutStore ALTER COLUMN _authSource TYPE VARCHAR(255)']; break; - case 'sqlsrv': + case 'sqlsrv': $update = [ - 'ALTER TABLE ' . $store->prefix . '_saml_LogoutStore ALTER COLUMN _authSource VARCHAR(255) NOT NULL' + 'ALTER TABLE ' . $store->prefix . + '_saml_LogoutStore ALTER COLUMN _authSource VARCHAR(255) NOT NULL' ]; break; case 'sqlite':