diff options
| author | cash <cash.costello@gmail.com> | 2011-11-05 19:15:42 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-11-05 19:15:42 -0400 |
| commit | 61d24f4b7b4fd4d5e960593a25a0d96b11891ff0 (patch) | |
| tree | af0128a6f7a99aa92c807bcfad03341c08fd35a6 /mod | |
| parent | eeade2d2716826b419c1ca67a62a102017c31b02 (diff) | |
| download | elgg-61d24f4b7b4fd4d5e960593a25a0d96b11891ff0.tar.gz elgg-61d24f4b7b4fd4d5e960593a25a0d96b11891ff0.tar.bz2 | |
Fixes #4024 fixed a lot of notices - enough for this release - found a few bugs
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/blog/start.php | 6 | ||||
| -rw-r--r-- | mod/file/start.php | 2 | ||||
| -rw-r--r-- | mod/groups/lib/discussion.php | 2 | ||||
| -rw-r--r-- | mod/groups/lib/groups.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/object/groupforumtopic.php | 3 | ||||
| -rw-r--r-- | mod/notifications/groups.php | 2 | ||||
| -rw-r--r-- | mod/notifications/index.php | 10 | ||||
| -rw-r--r-- | mod/profile/start.php | 2 | ||||
| -rw-r--r-- | mod/thewire/pages/thewire/everyone.php | 2 |
9 files changed, 20 insertions, 11 deletions
diff --git a/mod/blog/start.php b/mod/blog/start.php index 052c63651..fa57e7b96 100644 --- a/mod/blog/start.php +++ b/mod/blog/start.php @@ -145,7 +145,11 @@ function blog_page_handler($page) { return false; } - $params['sidebar'] .= elgg_view('blog/sidebar', array('page' => $page_type)); + if (isset($params['sidebar'])) { + $params['sidebar'] .= elgg_view('blog/sidebar', array('page' => $page_type)); + } else { + $params['sidebar'] = elgg_view('blog/sidebar', array('page' => $page_type)); + } $body = elgg_view_layout('content', $params); diff --git a/mod/file/start.php b/mod/file/start.php index d6e17cc4b..e15a9ad61 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -389,7 +389,7 @@ function file_icon_url_override($hook, $type, $returnvalue, $params) { if ($size == 'large') { $ext = '_lrg'; } else { - $exit = ''; + $ext = ''; } $url = "mod/file/graphics/icons/{$type}{$ext}.gif"; diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php index 68e5e4884..2bda4678e 100644 --- a/mod/groups/lib/discussion.php +++ b/mod/groups/lib/discussion.php @@ -192,7 +192,7 @@ function discussion_handle_view_page($guid) { ); $body = elgg_view_layout('content', $params); - echo elgg_view_page($title, $body); + echo elgg_view_page($topic->title, $body); } /** diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php index 590ba2b35..7798e5dc3 100644 --- a/mod/groups/lib/groups.php +++ b/mod/groups/lib/groups.php @@ -447,7 +447,7 @@ function groups_register_profile_buttons($group) { } // group members - if ($group->isMember($user)) { + if ($group->isMember(elgg_get_logged_in_user_entity())) { if ($group->getOwnerGUID() != elgg_get_logged_in_user_guid()) { // leave $url = elgg_get_site_url() . "action/groups/leave?group_guid={$group->getGUID()}"; diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index a579d89a4..34e0ee3cc 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -28,7 +28,7 @@ $tags = elgg_view('output/tags', array('tags' => $topic->tags)); $date = elgg_view_friendly_time($topic->time_created); $replies_link = ''; -$replies_text = ''; +$reply_text = ''; $num_replies = elgg_get_annotations(array( 'annotation_name' => 'group_topic_post', 'guid' => $topic->getGUID(), @@ -76,7 +76,6 @@ if ($full) { $body = elgg_view('output/longtext', array('value' => $topic->description)); echo <<<HTML -$header $info $body HTML; diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php index d64c00c8e..45fb94e83 100644 --- a/mod/notifications/groups.php +++ b/mod/notifications/groups.php @@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php'); gatekeeper(); elgg_set_page_owner_guid(elgg_get_logged_in_user_guid()); -$user = elgg_get_page_owner_guid(); +$user = elgg_get_page_owner_entity(); // Set the context to settings elgg_set_context('settings'); diff --git a/mod/notifications/index.php b/mod/notifications/index.php index e56042b73..882389fde 100644 --- a/mod/notifications/index.php +++ b/mod/notifications/index.php @@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php'); gatekeeper(); elgg_set_page_owner_guid(elgg_get_logged_in_user_guid()); -$user = elgg_get_page_owner_guid(); +$user = elgg_get_page_owner_entity(); // Set the context to settings elgg_set_context('settings'); @@ -24,7 +24,13 @@ elgg_push_breadcrumb($title); // Get the form $people = array(); -if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'user', 'limit' => 99999))) { +if ($people_ents = elgg_get_entities_from_relationship(array( + 'relationship' => 'notify', + 'relationship_guid' => elgg_get_logged_in_user_guid(), + 'types' => 'user', + 'limit' => 99999, + ))) { + foreach($people_ents as $ent) { $people[] = $ent->guid; } diff --git a/mod/profile/start.php b/mod/profile/start.php index 0ee2d0152..adee838fc 100644 --- a/mod/profile/start.php +++ b/mod/profile/start.php @@ -84,7 +84,7 @@ function profile_page_handler($page) { $content = elgg_view_layout('widgets', $params); $body = elgg_view_layout('one_column', array('content' => $content)); - echo elgg_view_page($title, $body); + echo elgg_view_page($user->name, $body); return true; } diff --git a/mod/thewire/pages/thewire/everyone.php b/mod/thewire/pages/thewire/everyone.php index e78395c31..4e88d17af 100644 --- a/mod/thewire/pages/thewire/everyone.php +++ b/mod/thewire/pages/thewire/everyone.php @@ -14,7 +14,7 @@ if (elgg_is_logged_in()) { $content .= elgg_view('input/urlshortener'); } -$content .= elgg_list_entities(array( +$content = elgg_list_entities(array( 'type' => 'object', 'subtype' => 'thewire', 'limit' => 15, |