extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "throw an exception on XML errors in eTemplates for easier fixing"

Browse Source 
This reverts commit 81b4737710.
This commit is contained in:
nathangray 2021-02-16 11:39:38 -07:00
parent 1501df227a
commit 18b7d9311c
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Etemplate/Widget.php
View File

@ -123,7 +123,7 @@ class Widget
// read all attributes // read all attributes
$this->set_attrs($reader); $this->set_attrs($reader);
while(($ok=$reader->read()) && $reader->depth > $depth) while($reader->read() && $reader->depth > $depth)
{ {
if ($reader->nodeType == XMLReader::ELEMENT && $reader->depth > $depth) if ($reader->nodeType == XMLReader::ELEMENT && $reader->depth > $depth)
{ {
@ -135,12 +135,6 @@ class Widget
$this->attrs[(string)$reader->name] = (string)$reader->value; $this->attrs[(string)$reader->name] = (string)$reader->value;
} }
} }
// give a clear indication where the template error is
if (!$ok && ($error = libxml_get_last_error()))
{
$file = str_replace([EGW_SERVER_ROOT.'/', '//default/etemplates/'], '', $error->file);
throw new \Exception("Error passing XML file '$file' line $error->line: $error->message");
}
// Reset content as we leave // Reset content as we leave
if($old_cont) { if($old_cont) {
@ -162,7 +156,6 @@ class Widget
} }
else else
{ {
libxml_use_internal_errors(true);
$reader = new XMLReader(); $reader = new XMLReader();
if (!$reader->XML($xml)) if (!$reader->XML($xml))
{ {