bug #337, call template_unescape() only at the end of template processing

diff --git a/boot.php b/boot.php
index b0a631170313de513e3db6415f9fa2f1be24ce0f..b3c79079a6f373f249546fe91be529c0c511c3d6 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1283' );
+define ( 'FRIENDICA_VERSION',      '2.3.1284' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1132      );
 

diff --git a/include/network.php b/include/network.php
index c72919dd8baf1fdaf25489e4ebccdd2f0fdd65c1..22157ff1889ce6ef4cebb8df3e09cce902ae7fba 100755 (executable)
--- a/include/network.php
+++ b/include/network.php
@@ -303,7 +303,7 @@ function webfinger_dfrn($s,&$hcard) {
 
 
 if(! function_exists('webfinger')) {
-function webfinger($s) {
+function webfinger($s, $debug = false) {
        $host = '';
        if(strstr($s,'@')) {
                $host = substr($s,strpos($s,'@') + 1);
@@ -328,7 +328,7 @@ function webfinger($s) {
 }}
 
 if(! function_exists('lrdd')) {
-function lrdd($uri) {
+function lrdd($uri, $debug = false) {
 
        $a = get_app();
 

diff --git a/include/template_processor.php b/include/template_processor.php
index 93bf391c5f0a431213dbce2150b8463e3e094856..4c317efe1fd466975545dd3a4ac64bfa344f23b5 100755 (executable)
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -203,7 +203,7 @@
                                $os=$s; $count++;
                                $s = $this->var_replace($s);
                        }
-                       return template_unescape($s);
+                       return $s;
                }
        }
        

diff --git a/include/text.php b/include/text.php
index cdf82ca87dfe7f4e48c7df146ea9e293c186d0e9..89acbf9fabc3d2acc4376f2100c0a53f0c6cd1da 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -20,7 +20,7 @@ function replace_macros($s,$r) {
        
        //$a = get_app();
        //$a->page['debug'] .= "$tt <br>\n";
-       return $r;
+       return template_unescape($r);
 
 }}