"share" - now the attribut value for the "author" is escaped
This commit is contained in:
parent
f4bc5c57f3
commit
7c7d3fe5de
5 changed files with 5 additions and 6 deletions
|
@ -221,7 +221,7 @@ function bb_ShareAttributes($match) {
|
||||||
$author = "";
|
$author = "";
|
||||||
preg_match("/author='(.*?)'/ism", $attributes, $matches);
|
preg_match("/author='(.*?)'/ism", $attributes, $matches);
|
||||||
if ($matches[1] != "")
|
if ($matches[1] != "")
|
||||||
$author = $matches[1];
|
$author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
|
||||||
|
|
||||||
preg_match('/author="(.*?)"/ism', $attributes, $matches);
|
preg_match('/author="(.*?)"/ism', $attributes, $matches);
|
||||||
if ($matches[1] != "")
|
if ($matches[1] != "")
|
||||||
|
|
|
@ -1025,7 +1025,7 @@ function diaspora_reshare($importer,$xml,$msg) {
|
||||||
$datarray['owner-link'] = $contact['url'];
|
$datarray['owner-link'] = $contact['url'];
|
||||||
$datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']);
|
$datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']);
|
||||||
if (intval(get_config('system','new_share'))) {
|
if (intval(get_config('system','new_share'))) {
|
||||||
$prefix = "[share author='".$person['name'].
|
$prefix = "[share author='".str_replace("'", "'",$person['name']).
|
||||||
"' profile='".$person['url'].
|
"' profile='".$person['url'].
|
||||||
"' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']).
|
"' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']).
|
||||||
"' link='".$orig_url."']";
|
"' link='".$orig_url."']";
|
||||||
|
|
|
@ -809,7 +809,7 @@ function get_atom_elements($feed,$item) {
|
||||||
logger('get_atom_elements: fixing sender of repeated message.');
|
logger('get_atom_elements: fixing sender of repeated message.');
|
||||||
|
|
||||||
if (intval(get_config('system','new_share'))) {
|
if (intval(get_config('system','new_share'))) {
|
||||||
$prefix = "[share author='".$name.
|
$prefix = "[share author='".str_replace("'", "'",$name).
|
||||||
"' profile='".$uri.
|
"' profile='".$uri.
|
||||||
"' avatar='".$avatar.
|
"' avatar='".$avatar.
|
||||||
"' link='".$orig_uri."']";
|
"' link='".$orig_uri."']";
|
||||||
|
|
|
@ -23,7 +23,7 @@ function share_init(&$a) {
|
||||||
$pos = strpos($r[0]['body'], "[share");
|
$pos = strpos($r[0]['body'], "[share");
|
||||||
$o = substr($r[0]['body'], $pos);
|
$o = substr($r[0]['body'], $pos);
|
||||||
} else {
|
} else {
|
||||||
$o = "[share author='".$r[0]['author-name'].
|
$o = "[share author='".str_replace("'", "'",$r[0]['author-name']).
|
||||||
"' profile='".$r[0]['author-link'].
|
"' profile='".$r[0]['author-link'].
|
||||||
"' avatar='".$r[0]['author-avatar'].
|
"' avatar='".$r[0]['author-avatar'].
|
||||||
"' link='".$r[0]['plink']."']\n";
|
"' link='".$r[0]['plink']."']\n";
|
||||||
|
|
|
@ -1689,8 +1689,7 @@ ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
|
||||||
background: linear-gradient(top, #ffffff 0%,#ececf2 100%);
|
background: linear-gradient(top, #ffffff 0%,#ececf2 100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover, {
|
ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
|
||||||
|
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
|
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
|
||||||
border: 1px solid #ececf2;
|
border: 1px solid #ececf2;
|
||||||
|
|
Loading…
Reference in a new issue