Refs #3201 updated foaf link to only be added to user's pages

diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php
index 54ee322e24e914f8f3cf360a96d404ab9ebff425..c6f674e6d4a1eb11db40f2a28c4ce78e72f58d07 100644 (file)
--- a/mod/profile/views/default/profile/metatags.php
+++ b/mod/profile/views/default/profile/metatags.php
@@ -6,7 +6,9 @@
  * 
  */
 
-if (elgg_get_page_owner_entity()) {
+$owner = elgg_get_page_owner_entity();
+
+if (elgg_instanceof($owner, 'user')) {
 ?>
        <link rel="meta" type="application/rdf+xml" title="FOAF" href="<?php echo full_url(); ?>?view=foaf" />
 <?php

diff --git a/views/foaf/page/default.php b/views/foaf/page/default.php
index 7dac2a0aa2bf791fc67b7b2163196006c9b55a9a..fad46ed35e85be48227655ef60f57f0e5ab4baf3 100644 (file)
--- a/views/foaf/page/default.php
+++ b/views/foaf/page/default.php
@@ -42,8 +42,6 @@ if (!$owner = elgg_get_page_owner_entity()) {
                <foaf:name><?php echo $owner->name; ?></foaf:name>
                <foaf:homepage rdf:resource="<?php echo $owner->getURL(); ?>" />
                <foaf:depiction rdf:resource="<?php echo elgg_format_url($owner->getIconURL('large')); ?>" />
-               <?php
-                       echo $vars['body'];
-               ?>
+<?php echo $vars['body']; ?>
        </foaf:Person>
 </rdf:RDF>

diff --git a/views/foaf/search/entity_list.php b/views/foaf/search/entity_list.php
deleted file mode 100644 (file)
index b786865..0000000
--- a/views/foaf/search/entity_list.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
-       foreach($entities as $entity) {
-               echo elgg_view_entity($entity);
-       }
-}
\ No newline at end of file

diff --git a/views/foaf/user/default.php b/views/foaf/user/default.php
index 8d059bc6b9714d03a8822d7fe4d1216cc290bb3c..dcba5556247a9e52e6a4deb78d4fb6d7076a3e05 100644 (file)
--- a/views/foaf/user/default.php
+++ b/views/foaf/user/default.php
@@ -6,7 +6,8 @@
  * @subpackage Core
  */
 
-$friends=get_user_friends(elgg_get_page_owner_guid(), $subtype = "", $limit = 10000, $offset = 0);
+// @todo update when get_user_friends is deprecated in 1.9
+$friends = get_user_friends(elgg_get_page_owner_guid(), $subtype = "", $limit = 10000, $offset = 0);
 
 foreach ($friends as $friend) {
 ?>