aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-17 18:15:36 -0700
committerfriendica <info@friendica.com>2012-03-17 18:15:36 -0700
commit67fd539f53756723d844dd204639146587f5bb76 (patch)
tree23a8a0823445735752668c0d93ef1d5dee363a95
parent94fac6d76725042fc176aaebd2af721ab1540ff7 (diff)
downloadvolse-hubzilla-67fd539f53756723d844dd204639146587f5bb76.tar.gz
volse-hubzilla-67fd539f53756723d844dd204639146587f5bb76.tar.bz2
volse-hubzilla-67fd539f53756723d844dd204639146587f5bb76.zip
bug #337, call template_unescape() only at the end of template processing
-rwxr-xr-xboot.php2
-rwxr-xr-xinclude/network.php4
-rwxr-xr-xinclude/template_processor.php2
-rw-r--r--include/text.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index b0a631170..b3c79079a 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 c72919dd8..22157ff18 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 93bf391c5..4c317efe1 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 cdf82ca87..89acbf9fa 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);
}}