From: friendica <info@friendica.com>
Date: Sun, 18 Mar 2012 01:15:36 +0000 (-0700)
Subject: bug #337, call template_unescape() only at the end of template processing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=67fd539f53756723d844dd204639146587f5bb76;p=friendica.git

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

diff --git a/boot.php b/boot.php
index b0a6311703..b3c79079a6 100755
--- 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 c72919dd8b..22157ff188 100755
--- 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 93bf391c5f..4c317efe1f 100755
--- 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 cdf82ca87d..89acbf9fab 100644
--- 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);
 
 }}