From 15084c8439789f614f159fd2ae1b466d8326c2cd Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 12 Nov 2020 14:41:23 -0700 Subject: [PATCH] Etemplate: Use the actual template attribute if set for action processing, instead of always using the deprecated options attribute --- api/src/Etemplate/Widget/Nextmatch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/Etemplate/Widget/Nextmatch.php b/api/src/Etemplate/Widget/Nextmatch.php index 94a2c525a6..e0c5b1c770 100644 --- a/api/src/Etemplate/Widget/Nextmatch.php +++ b/api/src/Etemplate/Widget/Nextmatch.php @@ -255,7 +255,7 @@ class Nextmatch extends Etemplate\Widget if (isset($value['actions']) && !isset($value['actions'][0])) { $value['action_links'] = array(); - $template_name = isset($value['template']) ? $value['template'] : $this->attrs['options']; + $template_name = isset($value['template']) ? $value['template'] : ($this->attrs['template'] ?: $this->attrs['options']); if (!is_array($value['action_links'])) $value['action_links'] = array(); $value['actions'] = self::egw_actions($value['actions'], $template_name, '', $value['action_links']); }