sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Prevent duplicate creation of print_exception function 

Signed-off-by: Louis Chemineau <louis@chmn.me>
pull/48213/head
Louis Chemineau 2024-09-18 09:23:19 +07:00 committed by Louis
parent ec0ff3d5dd
commit 0d543d193a
4 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/templates/exception.php
Unescape Escape View File

@ -4,20 +4,7 @@
style('core', ['styles', 'header']);
function print_exception(Throwable $e, \OCP\IL10N $l): void {
print_unescaped('<pre>');
p($e->getTraceAsString());
print_unescaped('</pre>');
if ($e->getPrevious() !== null) {
print_unescaped('<br />');
print_unescaped('<h4>');
p($l->t('Previous'));
print_unescaped('</h4>');
print_exception($e->getPrevious(), $l);
}
}
require_once __DIR__ . '/print_exception.php';
?>
<div class="guest-box wide">

21
core/templates/print_exception.php
Unescape Escape View File

@ -0,0 +1,21 @@
<?php
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2012-2015 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
function print_exception(Throwable $e, \OCP\IL10N $l): void {
print_unescaped('<pre>');
p($e->getTraceAsString());
print_unescaped('</pre>');
if ($e->getPrevious() !== null) {
print_unescaped('<br />');
print_unescaped('<h4>');
p($l->t('Previous'));
print_unescaped('</h4>');
print_exception($e->getPrevious(), $l);
}
}

16
core/templates/print_xml_exception.php
Unescape Escape View File

@ -0,0 +1,16 @@
<?php
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2012-2015 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
function print_exception(Throwable $e, \OCP\IL10N $l): void {
p($e->getTraceAsString());
if ($e->getPrevious() !== null) {
print_unescaped('<s:previous-exception>');
print_exception($e->getPrevious(), $l);
print_unescaped('</s:previous-exception>');
}
}

10
core/templates/xml_exception.php
Unescape Escape View File

@ -5,15 +5,7 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
function print_exception(Throwable $e, \OCP\IL10N $l): void {
p($e->getTraceAsString());
if ($e->getPrevious() !== null) {
print_unescaped('<s:previous-exception>');
print_exception($e->getPrevious(), $l);
print_unescaped('</s:previous-exception>');
}
}
require_once __DIR__ . '/print_xml_exception.php';
print_unescaped('<?xml version="1.0" encoding="utf-8"?>' . "\n");
?>