From 80357a330d247a6b30ef836b0acf6e1d32247763 Mon Sep 17 00:00:00 2001 From: markusbloch <> Date: Mon, 11 Jan 2016 20:06:10 +0000 Subject: [PATCH] version: fix missing newline when $param is used (Forum: #47155) git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@10464 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 2 ++ FHEM/98_version.pm | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGED b/CHANGED index 13f95498c..60ce611a4 100644 --- a/CHANGED +++ b/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: version: version command shows also internal helper modules that + are loaded (HttpUtils, Blocking, ...) - feature: 70_VIERA: Using non blocking for status update. Added color button for remoteControl and SVG layout Some new SVG icons for remoteControl layout diff --git a/FHEM/98_version.pm b/FHEM/98_version.pm index 7af1a156b..41daca25d 100755 --- a/FHEM/98_version.pm +++ b/FHEM/98_version.pm @@ -54,8 +54,9 @@ CommandVersion($$) @ret = sort {version_sortModules($a, $b)} @ret; return "no loaded modules found that match: $param" if($param && !@ret); return sprintf("%-".$max."s %s","File","Rev Last Change\n\n"). - join("\n", grep (($_ =~ /^fhem.pl|\d\d_/), @ret)).(!$param ? "\n\n":""). - join("\n", grep (($_ !~ /^fhem.pl|\d\d_/), @ret)); + trim(join("\n", grep (($_ =~ /^fhem.pl|\d\d_/), @ret))."\n\n". + join("\n", grep (($_ !~ /^fhem.pl|\d\d_/), @ret)) + ); } #####################################