harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix zrl bookmarks which broke with this checkin: c9192991c9

Browse Source 
It was documented that:
  Issues: Currently the order of HTML parameters in the text is somewhat rigid and inflexible.
but as that was in a different function it was easy to overlook.
This commit is contained in:
friendica 2014-02-18 19:47:13 -08:00
parent a258c8b98b
commit 6ac81c9360
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/text.php
View File

@ -1324,24 +1324,15 @@ function prepare_text($text,$content_type = 'text/bbcode') {
function zidify_callback($match) { function zidify_callback($match) {
if (feature_enabled(local_user(),'sendzid')) { $is_zid = ((feature_enabled(local_user(),'sendzid')) || (strpos($match[1],'zrl')) ? true : false);
$replace = '<a' . $match[1] . ' href="' . zid($match[2]) . '"'; $replace = '<a' . $match[1] . ' href="' . (($is_zid) ? zid($match[2]) : $match[2]) . '"';
}
else {
$replace = '<a' . $match[1] . 'class="zrl"' . $match[2] . ' href="' . zid($match[3]) . '"';
}
$x = str_replace($match[0],$replace,$match[0]); $x = str_replace($match[0],$replace,$match[0]);
return $x; return $x;
} }
function zidify_img_callback($match) { function zidify_img_callback($match) {
if (feature_enabled(local_user(),'sendzid')) { $is_zid = ((feature_enabled(local_user(),'sendzid')) || (strpos($match[1],'zrl')) ? true : false);
$replace = '<img' . $match[1] . ' src="' . zid($match[2]) . '"'; $replace = '<img' . $match[1] . ' src="' . (($is_zid) ? zid($match[2]) : $match[2]) . '"';
}
else {
$replace = '<img' . $match[1] . ' src="' . zid($match[2]) . '"';
}
$x = str_replace($match[0],$replace,$match[0]); $x = str_replace($match[0],$replace,$match[0]);
return $x; return $x;
@ -1349,25 +1340,13 @@ function zidify_img_callback($match) {
function zidify_links($s) { function zidify_links($s) {
if(feature_enabled(local_user(),'sendzid')) { $s = preg_replace_callback('/\<a(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);
$s = preg_replace_callback('/\<a(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s); $s = preg_replace_callback('/\<img(.*?)src\=\"(.*?)\"/ism','zidify_img_callback',$s);
$s = preg_replace_callback('/\<img(.*?)src\=\"(.*?)\"/ism','zidify_img_callback',$s);
}
else {
$s = preg_replace_callback('/\<a(.*?)class\=\"zrl\"(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);
$s = preg_replace_callback('/\<img class\=\"zrl\"(.*?)src\=\"(.*?)\"/ism','zidify_img_callback',$s);
// FIXME - remove the following line and redo the regex for the prev line once all Red images are converted to zmg
$s = preg_replace_callback('/\<img(.*?)src\=\"(.*?)\"/ism','zidify_img_callback',$s);
}
return $s; return $s;
} }
/** /**
* return atom link elements for all of our hubs * return atom link elements for all of our hubs
*/ */