Item12180: Convert ~p hack to attribute

git-svn-id: http://svn.foswiki.org/trunk@16173 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 8, 2012 · 87e97c1 · 87e97c1
1 parent 29fdf45
commit 87e97c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/core/lib/Foswiki/Configure/Pluggables/AUDIT.spec b/core/lib/Foswiki/Configure/Pluggables/AUDIT.spec
@@ -65,17 +65,17 @@
 #! Foswiki.spec, declare {foo} with AUDIT="CGI:0"
 
 {CGISetup} [CGI CORE:2 EXTN:3] NOLABEL AUDIT="CGI:101 CORE:102 EXTN:103" \
-                                       FEEDBACK="~p[/test/pathinfo]Web server" \
+                                       FEEDBACK="Web server";pinfo='/test/pathinfo' \
                                        FEEDBACK="Foswiki" \
                                        FEEDBACK="Extensions" 
 
 #! Buttons can control overlapping groups, which can be usefule for a series of tests that
 #! include supersets.
 #!{CGISetup} [CGI CORE:2 EXTN:3 CGI:4 CORE:4 EXTN:4] NOLABEL AUDIT="CGI:101 CORE:102 EXTN:103" \
-#!                                                           FEEDBACK="~p[/test/pathinfo]Web server" \
+#!                                                           FEEDBACK="Web server";pinfo='/test/pathinfo' \
 #!                                                           FEEDBACK="Foswiki" \
 #!                                                           FEEDBACK="Extensions" \
-#!                                                           FEEDBACK="~p[/test/pathinfo]Everything"
+#!                                                           FEEDBACK="Everything";pinfo='/test/pathinfo'
 
 # Click the Webserver action button to analyze and display the webserver environment.
 {ConfigureGUI}{PATHINFO} [_none] [PATHINFO] LABEL="<span class=\"configureItemLabel\">\

diff --git a/core/lib/Foswiki/Configure/UIs/Value.pm b/core/lib/Foswiki/Configure/UIs/Value.pm
@@ -109,15 +109,14 @@ sub renderHtml {
             my $invisible = '';
             my $pinfo     = '';
             my $fbl       = $fb->{'.label'};
+            if ( $fb->{pinfo} ) {
+                $pinfo = qq{, '$fb->{pinfo}'};
+            }
             if ( $fbl eq '~' ) {
                 $invisible = qq{ style="display:none;"};
                 $ac        = 1;
             }
             else {
-                if ( $fbl =~ /^~p\[(.*?)\](.*)$/ ) {
-                    $pinfo = qq{, '$1'};
-                    $fbl   = $2;
-                }
                 if ($tbl) {
                     my $fbc = $fb->{col} || $col + 1;
                     if ( $col == 0 || $fbc < $col ) {