fix double encoding of homepage in profile activity - not as straight-forward as it looked
This commit is contained in:
parent
0c98cacbcf
commit
2b3cc585a2
@ -48,7 +48,11 @@ function profile_activity($changed, $value) {
|
||||
|
||||
if($t == 1 && strlen($value)) {
|
||||
// if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to.
|
||||
$value = linkify($value);
|
||||
$value = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $value);
|
||||
// take out the bookmark indicator
|
||||
if(substr($value,0,2) === '#^')
|
||||
$value = str_replace('#^','',$value);
|
||||
|
||||
$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
|
||||
$message .= "\n\n" . sprintf( t('Visit %1$s\'s %2$s'), $A, $prof);
|
||||
}
|
||||
|
@ -884,6 +884,7 @@ function linkify($s) {
|
||||
return($s);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @function sslify($s)
|
||||
* Replace media element using http url with https to a local redirector if using https locally
|
||||
|
@ -611,7 +611,7 @@ function profiles_content(&$a) {
|
||||
}
|
||||
}
|
||||
|
||||
logger('extra_fields: ' . print_r($extra_fields,true));
|
||||
//logger('extra_fields: ' . print_r($extra_fields,true));
|
||||
|
||||
$f = get_config('system','birthday_input_format');
|
||||
if(! $f)
|
||||
|
@ -1 +1 @@
|
||||
2014-12-20.895
|
||||
2014-12-21.896
|
||||
|
Reference in New Issue
Block a user