mirror of
https://github.com/friendica/friendica
synced 2024-10-08 18:11:55 +02:00
Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
commit
4530f4ac9d
|
@ -1161,7 +1161,7 @@ class dfrn {
|
|||
|
||||
// Until now we aren't serving different sizes - but maybe later
|
||||
$avatarlist = array();
|
||||
// @todo check if "avatar" or "photo" would be the best field in the specification
|
||||
/// @todo check if "avatar" or "photo" would be the best field in the specification
|
||||
$avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
|
||||
foreach($avatars AS $avatar) {
|
||||
$href = "";
|
||||
|
@ -1381,7 +1381,7 @@ class dfrn {
|
|||
|
||||
$objxml = $obj_doc->saveXML($obj_element);
|
||||
|
||||
// @todo This isn't totally clean. We should find a way to transform the namespaces
|
||||
/// @todo This isn't totally clean. We should find a way to transform the namespaces
|
||||
$objxml = str_replace("<".$element.' xmlns="http://www.w3.org/2005/Atom">', "<".$element.">", $objxml);
|
||||
return($objxml);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue