diff options
| author | cash <cash.costello@gmail.com> | 2011-10-24 22:36:08 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-10-24 22:36:08 -0400 |
| commit | e1b8b96b1eaf41416ce08574c5b9b51530947cf0 (patch) | |
| tree | d846606475dbf211552ceeaaadf585fefad43a49 | |
| parent | 84a0b9670cc2a0b1efe75f1233311ef8152a9ab0 (diff) | |
| download | elgg-e1b8b96b1eaf41416ce08574c5b9b51530947cf0.tar.gz elgg-e1b8b96b1eaf41416ce08574c5b9b51530947cf0.tar.bz2 | |
Refs #3201 updated foaf link to only be added to user's pages
| -rw-r--r-- | mod/profile/views/default/profile/metatags.php | 4 | ||||
| -rw-r--r-- | views/foaf/page/default.php | 4 | ||||
| -rw-r--r-- | views/foaf/search/entity_list.php | 13 | ||||
| -rw-r--r-- | views/foaf/user/default.php | 3 |
4 files changed, 6 insertions, 18 deletions
diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php index 54ee322e2..c6f674e6d 100644 --- 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 7dac2a0aa..fad46ed35 100644 --- 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 index b786865d7..000000000 --- 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 8d059bc6b..dcba55562 100644 --- 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) { ?> |