[geeklog-cvs] geeklog: Reverted parts of the changes for bug #0001057: Do _not...

[geeklog-cvs at lists.geeklog.net]

changeset 7962:88368a86c3cf
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/88368a86c3cf
user: Dirk Haun <dirk at haun-online.de>
date: Sat Aug 14 21:38:46 2010 +0200
description:
Reverted parts of the changes for bug #0001057: Do _not_ escape curly braces
when displaying a block's content (bug #0001156)

diffstat:

 public_html/docs/history   |  5 +++++
 public_html/lib-common.php |  2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 20085a3cc25d -r 88368a86c3cf public_html/docs/history
--- a/public_html/docs/history	Wed Aug 11 20:36:16 2010 -0400
+++ b/public_html/docs/history	Sat Aug 14 21:38:46 2010 +0200
@@ -3,6 +3,11 @@
 ??? ?, 2010 (1.7.1)
 -----------
 
+- Reverted parts of the changes for bug #0001057: Do _not_ escape curly braces
+  when displaying a block's content (bug #0001156). If you run into the problem
+  that words in curly braces inside blocks are interpreted as template
+  variables, simply add a space after the opening and/or the closing brace
+  [Dirk]
 - Autotags can now be inserted directly into template files.
   (Feature #0001181) [Tom]
 - Plugins are able to control moderation and return a string to be displayed.
diff -r 20085a3cc25d -r 88368a86c3cf public_html/lib-common.php
--- a/public_html/lib-common.php	Wed Aug 11 20:36:16 2010 -0400
+++ b/public_html/lib-common.php	Sat Aug 14 21:38:46 2010 +0200
@@ -3709,8 +3709,6 @@
             $blockcontent = PLG_replaceTags($blockcontent);
         }
         $blockcontent = str_replace(array('<?', '?>'), '', $blockcontent);
-        $blockcontent = str_replace(array('{', '}'), array('{', '}'),
-                                    $blockcontent);
 
         $retval .= COM_startBlock($A['title'], $A['help'],
                        COM_getBlockTemplate($A['name'], 'header', $position))