diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-17 22:05:13 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-17 22:05:13 +0000 |
| commit | fc0fb6ec66aca4e439f434ce0d97df6d09388ef4 (patch) | |
| tree | 5727b866cc0cfba4b90de4f2a2954803f2eea4cc /pages/friends | |
| parent | 1ac1eb083987149a5f9522323b4affc6e2b079b7 (diff) | |
| download | elgg-fc0fb6ec66aca4e439f434ce0d97df6d09388ef4.tar.gz elgg-fc0fb6ec66aca4e439f434ce0d97df6d09388ef4.tar.bz2 | |
updated some of the core pages based on new CSS and layouts
git-svn-id: http://code.elgg.org/elgg/trunk@7667 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'pages/friends')
| -rw-r--r-- | pages/friends/index.php | 15 | ||||
| -rw-r--r-- | pages/friends/of.php | 15 |
2 files changed, 16 insertions, 14 deletions
diff --git a/pages/friends/index.php b/pages/friends/index.php index 13799e973..a8e5f7e8e 100644 --- a/pages/friends/index.php +++ b/pages/friends/index.php @@ -8,15 +8,12 @@ $owner = elgg_get_page_owner(); if (!$owner) { - gatekeeper(); - set_page_owner(get_loggedin_userid()); - $owner = elgg_get_page_owner(); + // unknown user so send away (@todo some sort of 404 error) + forward(); } $title = elgg_echo("friends:owned", array($owner->name)); -$content = elgg_view_title($title); - $options = array( 'relationship' => 'friend', 'relationship_guid' => $owner->getGUID(), @@ -24,8 +21,12 @@ $options = array( 'type' => 'user', 'full_view' => FALSE ); -$content .= elgg_list_entities_from_relationship($options); +$content = elgg_list_entities_from_relationship($options); -$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content)); +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); echo elgg_view_page($title, $body); diff --git a/pages/friends/of.php b/pages/friends/of.php index 66cda587d..395334ff5 100644 --- a/pages/friends/of.php +++ b/pages/friends/of.php @@ -8,15 +8,12 @@ $owner = elgg_get_page_owner(); if (!$owner) { - gatekeeper(); - set_page_owner(get_loggedin_userid()); - $owner = elgg_get_page_owner(); + // unknown user so send away (@todo some sort of 404 error) + forward(); } $title = elgg_echo("friends:of:owned", array($owner->name)); -$content = elgg_view_title($title); - $options = array( 'relationship' => 'friend', 'relationship_guid' => $owner->getGUID(), @@ -24,8 +21,12 @@ $options = array( 'type' => 'user', 'full_view' => FALSE ); -$content .= elgg_list_entities_from_relationship($options); +$content = elgg_list_entities_from_relationship($options); -$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content)); +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); echo elgg_view_page($title, $body); |