Skip to content

[stable19] Fix ratelimit template #26787

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.

Sign up for GitHub

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

Merged
rullzer merged 4 commits into from
Apr 29, 2021
Merged

[stable19] Fix ratelimit template #26787

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
167a4c7
Fix ratelimit template
nickvergessen Apr 23, 2021
aa178f9
Do not allow to overwrite some variables
nickvergessen Apr 23, 2021
f585fbc
Fix Nextcloud19 compatibility
nickvergessen Apr 28, 2021
43d6921
429 template is NC20+ and fix getDelay for CLI
nickvergessen Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not allow to overwrite some variables 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Apr 27, 2021
commit aa178f9e253e762e156c1206d55f4b37daf43407
4 changes: 3 additions & 1 deletion lib/private/Template/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ protected function load($file, $additionalParams = null) {
if (!is_null($additionalParams)) {
$_ = array_merge($additionalParams, $this->vars);
foreach ($_ as $var => $value) {
${$var} = $value;
if (!isset(${$var})) {
${$var} = $value;
}
}
}

Expand Down