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

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Roland Häder 2017-01-06 17:10:40 +01:00
parent cbc32143d7 0d32fce2df
commit 4530f4ac9d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dfrn.php
View File

@ -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);
}