extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 19:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing some conditions in the previous commit stalling InfoLog list

Browse Source
This commit is contained in:
Ralf Becker 2021-10-05 10:44:48 +02:00
parent 6ac401ef19
commit 29d2d7a580
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,8 @@ class Widget
} }
// Reset content as we leave // Reset content as we leave
if ($old_cont ?? null) { if (isset($old_cont))
{
self::$cont = $old_cont; self::$cont = $old_cont;
} }
} }
@ -206,7 +207,7 @@ class Widget
$template = $this; $template = $this;
while($reader->moveToNextAttribute()) while($reader->moveToNextAttribute())
{ {
if ($reader->name != 'id' && isset($template->attr[$reader->name]) && $template->attr[$reader->name] !== $reader->value) if ($reader->name != 'id' && (!isset($template->attr[$reader->name]) || $template->attr[$reader->name] !== $reader->value))
{ {
if (!$cloned) if (!$cloned)
{ {

2
api/src/Etemplate/Widget/Nextmatch.php
View File

@ -186,7 +186,7 @@ class Nextmatch extends Etemplate\Widget
if (true) $value =& self::get_array(self::$request->content, $form_name, true); if (true) $value =& self::get_array(self::$request->content, $form_name, true);
// Add favorite here so app doesn't save it in the session // Add favorite here so app doesn't save it in the session
if (empty($_GET['favorite'])) if (!empty($_GET['favorite']))
{ {
$send_value['favorite'] = $safe_name; $send_value['favorite'] = $safe_name;
} }