From 8b1a8d38f5af78d03a02cf7815676c77a63c900e Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 17 Oct 2017 12:48:25 +0200 Subject: [PATCH] Revert db10b21fa7875c4623fdd82be4de151adf93cb66 --- api/src/Etemplate/Widget/Nextmatch.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/api/src/Etemplate/Widget/Nextmatch.php b/api/src/Etemplate/Widget/Nextmatch.php index 1a1116baf1..79a1c71bd1 100644 --- a/api/src/Etemplate/Widget/Nextmatch.php +++ b/api/src/Etemplate/Widget/Nextmatch.php @@ -843,10 +843,7 @@ class Nextmatch extends Etemplate\Widget 'caption' => 'More', 'prefix' => $prefix, // display rest of actions incl. current one as children - 'children' => self::egw_actions( - array_slice($actions, $max_length-1, count($actions)-$max_length+1, true), - $template_name, $prefix, $action_links, $max_length,$default_attrs - ) + 'children' => array_slice($actions, $max_length-1, count($actions)-$max_length+1, true), ); //echo "*** Inserting id=$prefix$id"; _debug_array($action); // we break at end of foreach loop, as rest of actions is already dealt with @@ -878,10 +875,7 @@ class Nextmatch extends Etemplate\Widget // link or popup action if ($action['url']) { - if(strpos($action['url'], 'http') === false) - { - $action['url'] = Api\Framework::link('/index.php',str_replace('$action',$id,$action['url'])); - } + $action['url'] = Api\Framework::link('/index.php',str_replace('$action',$id,$action['url'])); if ($action['popup']) { list($action['data']['width'],$action['data']['height']) = explode('x',$action['popup']);