Skip to content

Commit 0ffef41

Browse files
Fix core:loginpage_links (and other extra parameters) in SQL1 compat layer
1 parent 4b38aa5 commit 0ffef41

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

src/Auth/Source/PasswordVerify1Compat.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,15 @@ public function __construct(array $info, array $config)
6161
}
6262
}
6363

64+
// Copy other config keys that are not specific to SQL1 (eg. core:login_links)
65+
foreach (array_keys($config) as $key) {
66+
if (in_array($key, ['dsn', 'username', 'password', 'query', 'username_regex', 'passwordhashcolumn'])) {
67+
continue;
68+
}
69+
70+
$v2config[$key] = $config[$key];
71+
}
72+
6473
parent::__construct($info, $v2config);
6574
}
6675
}

src/Auth/Source/SQL1Compat.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@ public function __construct(array $info, array $config)
5555
}
5656
}
5757

58+
// Copy other config keys that are not specific to SQL1 (eg. core:login_links)
59+
foreach (array_keys($config) as $key) {
60+
if (in_array($key, ['dsn', 'username', 'password', 'query', 'username_regex'])) {
61+
continue;
62+
}
63+
64+
$v2config[$key] = $config[$key];
65+
}
66+
5867
parent::__construct($info, $v2config);
5968
}
6069
}

0 commit comments

Comments
 (0)