clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1644 from fabrixxm/issue-1514 

mask '#' in `[url]` url
This commit is contained in:
Tobias Diekershoff 2015-06-02 19:38:03 +02:00
parent a36014fb0f 20b14b053a
commit f9994554a7
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/items.php
View File

@ -1697,12 +1697,12 @@ function item_body_set_hashtags(&$item) {
// mask hashtags inside of url, bookmarks and attachments to avoid urls in urls // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
$item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
function ($match){ function ($match){
return("[url=".$match[1]."]".str_replace("#", "#", $match[2])."[/url]"); return("[url=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/url]");
},$item["body"]); },$item["body"]);
$item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", $item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism",
function ($match){ function ($match){
return("[bookmark=".$match[1]."]".str_replace("#", "#", $match[2])."[/bookmark]"); return("[bookmark=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/bookmark]");
},$item["body"]); },$item["body"]);
$item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism", $item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism",
@ -1714,6 +1714,7 @@ function item_body_set_hashtags(&$item) {
$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
"#$2", $item["body"]); "#$2", $item["body"]);
foreach($tags as $tag) { foreach($tags as $tag) {
if(strpos($tag,'#') !== 0) if(strpos($tag,'#') !== 0)
continue; continue;
@ -4956,17 +4957,17 @@ function first_post_date($uid,$wall = false) {
/* modified posted_dates() {below} to arrange the list in years */ /* modified posted_dates() {below} to arrange the list in years */
function list_post_dates($uid, $wall) { function list_post_dates($uid, $wall) {
$dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d');
$dthen = first_post_date($uid, $wall); $dthen = first_post_date($uid, $wall);
if(! $dthen) if(! $dthen)
return array(); return array();
// Set the start and end date to the beginning of the month // Set the start and end date to the beginning of the month
$dnow = substr($dnow,0,8).'01'; $dnow = substr($dnow,0,8).'01';
$dthen = substr($dthen,0,8).'01'; $dthen = substr($dthen,0,8).'01';
$ret = array(); $ret = array();
// Starting with the current month, get the first and last days of every // Starting with the current month, get the first and last days of every
// month down to and including the month of the first post // month down to and including the month of the first post
while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
@ -5021,19 +5022,19 @@ function posted_date_widget($url,$uid,$wall) {
/* if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget'))) /* if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget')))
return $o;*/ return $o;*/
$visible_years = get_pconfig($uid,'system','archive_visible_years'); $visible_years = get_pconfig($uid,'system','archive_visible_years');
if(! $visible_years) if(! $visible_years)
$visible_years = 5; $visible_years = 5;
$ret = list_post_dates($uid,$wall); $ret = list_post_dates($uid,$wall);
if(! count($ret)) if(! count($ret))
return $o; return $o;
$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years; $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
$cutoff = ((array_key_exists($cutoff_year,$ret))? true : false); $cutoff = ((array_key_exists($cutoff_year,$ret))? true : false);
$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array( $o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
'$title' => t('Archives'), '$title' => t('Archives'),
'$size' => $visible_years, '$size' => $visible_years,