clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move System::httpExit to BaseModule->httpExit

Browse Source 
- This will ensure headers set in BaseModule->run will be carried in httpExit scenarios
- Deprecate httpExit() method in Core\System
This commit is contained in:
Hypolite Petovan
2023-09-21 12:35:55 -04:00
parent 94e3dde2e3
commit da1416c07f
24 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Module/Calendar/Event/API.php
View File

@@ -183,7 +183,7 @@ class API extends BaseModule
if (strcmp($finish, $start) < 0 && !$noFinish) {
if ($isPreview) {
System::httpExit($this->t('Event can not end before it has started.'));
$this->httpExit($this->t('Event can not end before it has started.'));
} else {
$this->sysMessages->addNotice($this->t('Event can not end before it has started.'));
$this->baseUrl->redirect($redirectOnError);
@@ -192,7 +192,7 @@ class API extends BaseModule
if (empty($summary) || ($start === DBA::NULL_DATETIME)) {
if ($isPreview) {
System::httpExit($this->t('Event title and start time are required.'));
$this->httpExit($this->t('Event title and start time are required.'));
} else {
$this->sysMessages->addNotice($this->t('Event title and start time are required.'));
$this->baseUrl->redirect($redirectOnError);
@@ -251,7 +251,7 @@ class API extends BaseModule
];
if (intval($request['preview'])) {
System::httpExit(Event::getHTML($datarray));
$this->httpExit(Event::getHTML($datarray));
}
$eventId = Event::store($datarray);

2
src/Module/Calendar/Event/Show.php
View File

@@ -81,6 +81,6 @@ class Show extends BaseModule
'$event' => $tplEvent,
]);
System::httpExit($o);
$this->httpExit($o);
}
}