keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8503 from annando/xmlhead-notice

Browse source 
Fix notice about an unknown variable
This commit is contained in:
Hypolite Petovan 2020-04-05 16:46:52 -04:00 committed by GitHub
commit 7899892351
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/conversation.php
View file

@ -148,6 +148,8 @@ function localize_item(&$item)
if (!empty($item['verb'])) { if (!empty($item['verb'])) {
$activity = DI::activity(); $activity = DI::activity();
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
if (stristr($item['verb'], Activity::POKE)) { if (stristr($item['verb'], Activity::POKE)) {
$verb = urldecode(substr($item['verb'], strpos($item['verb'],'#') + 1)); $verb = urldecode(substr($item['verb'], strpos($item['verb'],'#') + 1));
if (!$verb) { if (!$verb) {
@ -160,8 +162,6 @@ function localize_item(&$item)
$Aname = $item['author-name']; $Aname = $item['author-name'];
$Alink = $item['author-link']; $Alink = $item['author-link'];
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
$obj = XML::parseString($xmlhead . $item['object']); $obj = XML::parseString($xmlhead . $item['object']);
$Bname = $obj->title; $Bname = $obj->title;
@ -237,7 +237,7 @@ function localize_item(&$item)
} }
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
$parsedobj = XML::parseString($xmlhead.$item['object']); $parsedobj = XML::parseString($xmlhead . $item['object']);
$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content); $tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
$item['body'] = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag); $item['body'] = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag);