Item9769: syncing with foswiki/trunk

git-svn-id: http://svn.foswiki.org/branches/Release01x01@9440 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Sep 30, 2010 · b1b08ea · b1b08ea
1 parent 325b6c5
commit b1b08ea
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -155,7 +155,7 @@ BEGIN {
         }
     }
     else {
-        $Error::Debug = 0;        # no verbose stack traces
+        $Error::Debug = 0;        # no verbose stack traces 
     }
 
     # DO NOT CHANGE THE FORMAT OF $VERSION
@@ -359,6 +359,7 @@ BEGIN {
     $macros{STATISTICSTOPIC}   = sub { $Foswiki::cfg{Stats}{TopicName} };
     $macros{SYSTEMWEB}         = sub { $Foswiki::cfg{SystemWebName} };
     $macros{TRASHWEB}          = sub { $Foswiki::cfg{TrashWebName} };
+    $macros{SANDBOXWEB}        = sub { $Foswiki::cfg{SandboxWebName} };
     $macros{WIKIADMINLOGIN}    = sub { $Foswiki::cfg{AdminUserLogin} };
     $macros{USERSWEB}          = sub { $Foswiki::cfg{UsersWebName} };
     $macros{WEBPREFSTOPIC}     = sub { $Foswiki::cfg{WebPrefsTopicName} };
@@ -3442,7 +3443,6 @@ sub _renderZone {
         $line =~ s/\$item\b/$text/g;
         $line =~ s/\$id\b/$id/g;
         $line =~ s/\$zone\b/$item->{zone}/g;
-        $line = expandStandardEscapes($line);
         push @result, $line if $line;
     }
     my $result =