tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.12' into 4

This commit is contained in:
Steve Boyd 2023-02-02 16:20:00 +13:00
parent c430011f19 20e4aae25b
commit 23efed1802
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Control/CLIRequestBuilder.php
View File

@ -64,6 +64,13 @@ class CLIRequestBuilder extends HTTPRequestBuilder
$variables['_GET']['url'] = $variables['_SERVER']['argv'][1];
$variables['_SERVER']['REQUEST_URI'] = $variables['_SERVER']['argv'][1];
}
// Set 'HTTPS' and 'SSL' flag for CLI depending on SS_BASE_URL scheme value.
$scheme = parse_url(Environment::getEnv('SS_BASE_URL') ?? '', PHP_URL_SCHEME);
if ($scheme == 'https') {
$variables['_SERVER']['HTTPS'] = 'on';
$variables['_SERVER']['SSL'] = true;
}
// Parse rest of variables as standard
return parent::cleanEnvironment($variables);

2
src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
View File

@ -587,7 +587,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
/**
* Get the current paginator state
*/
private function getGridFieldPaginatorState(): GridState_Data
private function getGridFieldPaginatorState(): ?GridState_Data
{
$state = $this->getGridField()->getState(false);
$gridStateStr = $this->getStateManager()->getStateFromRequest($this->gridField, $this->getRequest());

2
src/Security/PermissionCheckboxSetField.php
View File

@ -207,7 +207,7 @@ class PermissionCheckboxSetField extends FormField
$odd = ($odd + 1) % 2;
$extraClass = $odd ? 'odd' : 'even';
$extraClass .= ' val' . str_replace(' ', '', $code ?? '');
$extraClass .= ' val' . str_replace([' ', '\\'], ['', '-'], $code ?? '');
$itemID = $this->ID() . '_' . preg_replace('/[^a-zA-Z0-9]+/', '', $code ?? '');
$disabled = $inheritMessage = '';
$checked = (isset($uninheritedCodes[$code]) || isset($inheritedCodes[$code]))