From 67576e1965449643c12cd31744331d68e69d7392 Mon Sep 17 00:00:00 2001
From: justme1968 <justme1968@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Wed, 4 Sep 2013 16:27:23 +0000
Subject: [PATCH] bug fix

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@3854 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/33_readingsGroup.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm
index c3b8467b6..b168b7247 100644
--- a/fhem/FHEM/33_readingsGroup.pm
+++ b/fhem/FHEM/33_readingsGroup.pm
@@ -40,17 +40,17 @@ readingsGroup_updateDevices($)
     # for backwards compatibility with weblink readings
     if( $param eq '*noheading' ) {
       $attr{$hash->{NAME}}{noheading} = 1;
-      $hash->{DEF} =~ s/(\s*)$param((:\S+)?\s*)/ /g;
+      $hash->{DEF} =~ s/(\s*)\\$param((:\S+)?\s*)/ /g;
       $hash->{DEF} =~ s/^ //;
       $hash->{DEF} =~ s/ $//;
     } elsif( $param eq '*notime' ) {
       $attr{$hash->{NAME}}{notime} = 1;
-      $hash->{DEF} =~ s/(\s*)$param((:\S+)?\s*)/ /g;
+      $hash->{DEF} =~ s/(\s*)\\$param((:\S+)?\s*)/ /g;
       $hash->{DEF} =~ s/^ //;
       $hash->{DEF} =~ s/ $//;
     } elsif( $param eq '*nostate' ) {
       $attr{$hash->{NAME}}{nostate} = 1;
-      $hash->{DEF} =~ s/(\s*)$param((:\S+)?\s*)/ /g;
+      $hash->{DEF} =~ s/(\s*)\\$param((:\S+)?\s*)/ /g;
       $hash->{DEF} =~ s/^ //;
       $hash->{DEF} =~ s/ $//;
     } elsif( $param =~ m/^{/) {
@@ -222,6 +222,10 @@ readingsGroup_2html($)
           $m =~ s/\%DEVICE/$name/g;
           $m =~ s/\%READING/$n/g;
           $m =~ s/\%ALIAS/$a/g;
+
+          $m =~ s/\$DEVICE/$name/g;
+          $m =~ s/\$READING/$n/g;
+          $m =~ s/\$ALIAS/$a/g;
         }
 
         $ret .= "<td><div $name_style class=\"dname\"><a href=\"/fhem?detail=$name\">$m</a></div></td>";
@@ -289,6 +293,10 @@ readingsGroup_2html($)
           $m =~ s/\%DEVICE/$name/g;
           $m =~ s/\%READING/$n/g;
           $m =~ s/\%ALIAS/$a/g;
+
+          $m =~ s/\$DEVICE/$name/g;
+          $m =~ s/\$READING/$n/g;
+          $m =~ s/\$ALIAS/$a/g;
         }
 
         $ret .= "<td><div $name_style class=\"xdname\"><a href=\"/fhem?detail=$name\">$m</a></div></td>";
@@ -515,7 +523,7 @@ readingsGroup_Get($@)
         Can be a simple string or a perl expression enclosed in {} that returns a hash that maps reading names to the displayed name.
         The keys can be either the name of the reading or &lt;device&gt;.&lt;reading&gt;.
         %DEVICE, %ALIAS and %READING are replaced by the device name, device alias and reading name respectively, e.g:<br>
-          <code>attr temperatures mapping %DEVICE-%READING</code><br>
+          <code>attr temperatures mapping $DEVICE-$READING</code><br>
           <code>attr temperatures mapping {temperature => "%DEVICE Temperatur"}</code>
         </li>
       <li>separator<br>