friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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

This commit is contained in:
friendica 2012-03-17 18:15:36 -07:00
parent 94fac6d767
commit 67fd539f53
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1283' ); define ( 'FRIENDICA_VERSION', '2.3.1284' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1132 ); define ( 'DB_UPDATE_VERSION', 1132 );

4
include/network.php
View File

@ -303,7 +303,7 @@ function webfinger_dfrn($s,&$hcard) {
if(! function_exists('webfinger')) { if(! function_exists('webfinger')) {
function webfinger($s) { function webfinger($s, $debug = false) {
$host = ''; $host = '';
if(strstr($s,'@')) { if(strstr($s,'@')) {
$host = substr($s,strpos($s,'@') + 1); $host = substr($s,strpos($s,'@') + 1);
@ -328,7 +328,7 @@ function webfinger($s) {
}} }}
if(! function_exists('lrdd')) { if(! function_exists('lrdd')) {
function lrdd($uri) { function lrdd($uri, $debug = false) {
$a = get_app(); $a = get_app();

2
include/template_processor.php
View File

@ -203,7 +203,7 @@
$os=$s; $count++; $os=$s; $count++;
$s = $this->var_replace($s); $s = $this->var_replace($s);
} }
return template_unescape($s); return $s;
} }
} }

2
include/text.php
View File

@ -20,7 +20,7 @@ function replace_macros($s,$r) {
//$a = get_app(); //$a = get_app();
//$a->page['debug'] .= "$tt <br>\n"; //$a->page['debug'] .= "$tt <br>\n";
return $r; return template_unescape($r);
}} }}