diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/groups/invitations.php | 2 | ||||
| -rw-r--r-- | mod/groups/new.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/river/forum/create.php | 17 | ||||
| -rw-r--r-- | mod/groups/views/default/river/forum/topic/create.php | 10 | ||||
| -rw-r--r-- | mod/pages/views/default/river/object/page/create.php | 10 | ||||
| -rw-r--r-- | mod/profile/actions/edit.php | 6 |
6 files changed, 19 insertions, 28 deletions
diff --git a/mod/groups/invitations.php b/mod/groups/invitations.php index f2594c786..70d65469e 100644 --- a/mod/groups/invitations.php +++ b/mod/groups/invitations.php @@ -12,6 +12,8 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); gatekeeper(); +set_page_owner(get_loggedin_userid()); + $user = get_loggedin_user(); $title = elgg_echo('groups:invitations'); diff --git a/mod/groups/new.php b/mod/groups/new.php index 32b8d1902..95cabd3be 100644 --- a/mod/groups/new.php +++ b/mod/groups/new.php @@ -11,6 +11,8 @@ gatekeeper(); + set_page_owner(get_loggedin_userid()); + // Render the file upload page $title = elgg_echo("groups:new"); $area2 = elgg_view_title($title); diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php index e51d9fe72..4906fc869 100644 --- a/mod/groups/views/default/river/forum/create.php +++ b/mod/groups/views/default/river/forum/create.php @@ -1,4 +1,7 @@ <?php +/** + * Any comment on original post + */ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $object = get_entity($vars['item']->object_guid); @@ -6,8 +9,9 @@ $forumtopic = $object->guid; $group_guid = $object->container_guid; //grab the annotation, if one exists - if($vars['item']->annotation_id != 0) + if($vars['item']->annotation_id != 0) { $comment = get_annotation($vars['item']->annotation_id)->value; + } $contents = strip_tags($contents);//this is so we don't get large images etc in the activity river $url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid; $url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; @@ -15,14 +19,7 @@ $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= "<div class=\"river_content_display\">"; - if($comment){ - $contents = strip_tags($comment);//this is so we don't get large images etc in the activity river - if(strlen($contents) > 200) - $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "…"; - else - $string .= $contents; - } + $string .= elgg_make_excerpt($contents, 200); $string .= "</div>"; -?> -<?php echo $string; ?>
\ No newline at end of file + echo $string; diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php index 7b06cd275..a8d444465 100644 --- a/mod/groups/views/default/river/forum/topic/create.php +++ b/mod/groups/views/default/river/forum/topic/create.php @@ -16,13 +16,7 @@ $string .= "<a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span> <a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= "<div class=\"river_content_display\">"; - if(strlen($contents) > 200) { - $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "…"; - }else{ - $string .= $contents; - } + $string .= elgg_make_excerpt($contents, 200); $string .= "</div>"; -?> - -<?php echo $string; ?>
\ No newline at end of file + echo $string;
\ No newline at end of file diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php index 25efc216a..e34145d79 100644 --- a/mod/pages/views/default/river/object/page/create.php +++ b/mod/pages/views/default/river/object/page/create.php @@ -11,13 +11,7 @@ $string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= "<div class=\"river_content_display\">"; - if(strlen($contents) > 200) { - $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "…"; - }else{ - $string .= $contents; - } + $string .= elgg_make_excerpt($contents, 200); $string .= "</div>"; -?> - -<?php echo $string; ?>
\ No newline at end of file + echo $string;
\ No newline at end of file diff --git a/mod/profile/actions/edit.php b/mod/profile/actions/edit.php index baeb49108..839b269af 100644 --- a/mod/profile/actions/edit.php +++ b/mod/profile/actions/edit.php @@ -104,8 +104,10 @@ if (sizeof($input) > 0) { // Notify of profile update trigger_elgg_event('profileupdate',$user->type,$user); - //add to river - add_to_river('river/user/default/profileupdate','update',$_SESSION['user']->guid,$_SESSION['user']->guid,get_default_access($_SESSION['user'])); + //add to river if edited by self + if (get_loggedin_userid() == $user->guid) { + add_to_river('river/user/default/profileupdate','update',$_SESSION['user']->guid,$_SESSION['user']->guid,get_default_access($_SESSION['user'])); + } system_message(elgg_echo("profile:saved")); } |