From aae8e751ab92814f8fd00551dd158e01e4c95f12 Mon Sep 17 00:00:00 2001
From: justme-1968 <justme-1968@users.noreply.github.com>
Date: Sun, 21 Jun 2015 08:25:24 +0000
Subject: [PATCH] 33_readingsGroup.pm: (re-) changed order of value mapping

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@8789 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/33_readingsGroup.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/FHEM/33_readingsGroup.pm b/FHEM/33_readingsGroup.pm
index a63e02020..60603804c 100644
--- a/FHEM/33_readingsGroup.pm
+++ b/FHEM/33_readingsGroup.pm
@@ -534,7 +534,7 @@ readingsGroup_value2html($$$$$$$$$)
   my $cmd;
   my $devStateIcon;
   if( my $value_icon = $hash->{helper}{valueIcon} ) {
-    if( my $icon = lookup($value_icon,$name,$alias,$n,$value_orig,$room,$group,$cell_row,"") ) {
+    if( my $icon = lookup($value_icon,$name,$alias,$n,$value_formated,$room,$group,$cell_row,"") ) {
       if( $icon =~ m/^[\%\$]devStateIcon$/ ) {
         my %extPage = ();
         my ($allSets, $cmdlist, $txt) = FW_devState($name, $room, \%extPage);
@@ -542,14 +542,14 @@ readingsGroup_value2html($$$$$$$$$)
       } else {
         $devStateIcon = FW_makeImage( $icon, $v, "icon" );
         $cmd = lookup2($hash->{helper}{commands},$name,$n,$icon);
-        $cmd = lookup2($hash->{helper}{commands},$name,$n,$value_orig) if( !$cmd );
+        $cmd = lookup2($hash->{helper}{commands},$name,$n,$value_formated) if( !$cmd );
       }
     }
   }
 
   my $webCmdFn = 0;
   if( !$devStateIcon ) {
-    $cmd = lookup2($hash->{helper}{commands},$name,$n,$value_orig);
+    $cmd = lookup2($hash->{helper}{commands},$name,$n,$value_formated);
 
     if( $cmd && $cmd =~ m/^([\w\/.-]*):(\S*)?(\s\S*)?$/ ) {
       my $set = $1;
@@ -600,14 +600,14 @@ readingsGroup_value2html($$$$$$$$$)
   ($v,$devStateIcon) = readingsGroup_makeLink($v,$devStateIcon,$cmd) if( !$webCmdFn );
 
   if( my $value_prefix = $hash->{helper}{valuePrefix} ) {
-    if( my $value_prefix = lookup2($value_prefix,$name,$n,$value_orig) ) {
+    if( my $value_prefix = lookup2($value_prefix,$name,$n,$value_formated) ) {
       $v = $value_prefix . $v;
       $devStateIcon = $value_prefix . $devStateIcon if( $devStateIcon );
     }
   }
 
   if( my $value_suffix = $hash->{helper}{valueSuffix} ) {
-    if( my $value_suffix = lookup2($value_suffix,$name,$n,$value_orig) ) {
+    if( my $value_suffix = lookup2($value_suffix,$name,$n,$value_formated) ) {
       $v .= $value_suffix;
       $devStateIcon .= $value_suffix if( $devStateIcon );
     }