Skip to content
Code-Schnipsel Gruppen Projekte
Bestätigt Commit e881d963 erstellt von Jan Wennrich's avatar Jan Wennrich
Dateien durchsuchen

fix(upload): make sure variable is always defined

Previously variable $QUM might not be defined.
This would have happened, if the permission check threw a QUI\Exception
Übergeordneter 1e498434
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
3 Merge Requests!190Release,!187ci: show phpunit results in GitLab UI,!118Refactorings & Fixes based on PHPStan
......@@ -13,30 +13,34 @@
try {
QUI\Permissions\Permission::checkPermission('quiqqer.frontend.upload');
} catch (\Exception $Exception) {
QUI\System\Log::writeDebugException($Exception);
}
$QUM = new QUI\Upload\Manager();
QUI::getAjax();
$QUM = new QUI\Upload\Manager();
QUI::getAjax();
try {
$uploadResult = $QUM->init();
if (!empty($uploadResult)) {
$result = [
'result' => $uploadResult,
'maintenance' => QUI::conf('globals', 'maintenance') ? 1 : 0
];
if (QUI::getMessagesHandler()) {
$result['message_handler'] = QUI::getMessagesHandler()->getMessagesAsArray(
QUI::getUserBySession()
);
}
// maintenance flag
echo '<quiqqer>' . json_encode($result) . '</quiqqer>';
}
} catch (QUI\Exception $Exception) {
} catch (\QUI\Exception $Exception) {
QUI\System\Log::writeDebugException($Exception);
$QUM->flushException($Exception);
} catch (\Exception $Exception) {
QUI\System\Log::writeDebugException($Exception);
}
if (empty($uploadResult)) {
exit;
}
$result = [
'result' => $uploadResult,
'maintenance' => QUI::conf('globals', 'maintenance') ? 1 : 0
];
if (QUI::getMessagesHandler()) {
$result['message_handler'] = QUI::getMessagesHandler()->getMessagesAsArray(
QUI::getUserBySession()
);
}
// maintenance flag
echo '<quiqqer>' . json_encode($result) . '</quiqqer>';
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren