X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ffoaf.php;h=db6ce78f2005d0db0ebbd218b106fa4eaafc0aed;hb=4aedce6864eb27a0c37b3dcae22fee0aa16ae537;hp=d005510b6c3e834085ac12731e3c07be1a5f5397;hpb=c73ebf3382196dfd175fd1d5bc966157d96cde38;p=quix0rs-gnu-social.git

diff --git a/actions/foaf.php b/actions/foaf.php
index d005510b6c..db6ce78f20 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -51,6 +51,8 @@ class FoafAction extends Action {
 											  'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
 											  'xmlns:rdfs' =>
 											  'http://www.w3.org/2000/01/rdf-schema#',
+											  'xmlns:geo' =>
+											  'http://www.w3.org/2003/01/geo/wgs84_pos#',
 											  'xmlns' => 'http://xmlns.com/foaf/0.1/'));
 
 		# This is the document about the user
@@ -90,7 +92,7 @@ class FoafAction extends Action {
 				$scaled = $profile->getAvatar($size);
 				if (!$scaled->original) { # sometimes the original has one of our scaled sizes
 					common_element_start('thumbnail');
-					common_element('Image', array('rdf:about', $scaled->url));
+					common_element('Image', array('rdf:about' => $scaled->url));
 					common_element_end('thumbnail');
 				}
 			}
@@ -108,11 +110,15 @@ class FoafAction extends Action {
 		if ($sub->find()) {
 			while ($sub->fetch()) {
 				if ($sub->token) {
-					$other = Remote_profile::staticGet($sub->subscribed);
+					$other = Remote_profile::staticGet('id', $sub->subscribed);
 				} else {
-					$other = User::staticGet($sub->subscribed);
+					$other = User::staticGet('id', $sub->subscribed);
 				}
-				common_element('knows', array('rdf:about', $other->uri));
+				if (!$other) {
+					common_debug('Got a bad subscription: '.print_r($sub,TRUE));
+					continue;
+				}
+				common_element('knows', array('rdf:resource' => $other->uri));
 				$person[$other->uri] = array(LISTENEE, $other);
 			}
 		}
@@ -125,9 +131,13 @@ class FoafAction extends Action {
 		if ($sub->find()) {
 			while ($sub->fetch()) {
 				if ($sub->token) {
-					$other = Remote_profile::staticGet($sub->subscribed);
+					$other = Remote_profile::staticGet('id', $sub->subscriber);
 				} else {
-					$other = User::staticGet($sub->subscribed);
+					$other = User::staticGet('id', $sub->subscriber);
+				}
+				if (!$other) {
+					common_debug('Got a bad subscription: '.print_r($sub,TRUE));
+					continue;
 				}
 				if (array_key_exists($other->uri, $person)) {
 					$person[$other->uri][0] = BOTH;
@@ -147,7 +157,7 @@ class FoafAction extends Action {
 			$profile = Profile::staticGet($p[1]->id);
 			common_element_start('Person', array('rdf:about' => $uri));
 			if ($p[0] == LISTENER || $p[0] == BOTH) {
-				common_element('knows', array('rdf:about', $user->uri));
+				common_element('knows', array('rdf:resource' => $user->uri));
 			}
 			$this->show_microblogging_account($profile, ($p[1] instanceof User) ?
 											  common_root_url() : NULL);