diff options
Diffstat (limited to 'mod/profile/actions')
-rw-r--r-- | mod/profile/actions/addcomment.php | 33 | ||||
-rw-r--r-- | mod/profile/actions/edit.php | 4 |
2 files changed, 18 insertions, 19 deletions
diff --git a/mod/profile/actions/addcomment.php b/mod/profile/actions/addcomment.php index 5817b8e83..07f72ef8e 100644 --- a/mod/profile/actions/addcomment.php +++ b/mod/profile/actions/addcomment.php @@ -5,44 +5,43 @@ // Make sure we're logged in; forward to the front page if not if (!isloggedin()) forward(); - + // Get input $message_content = get_input('message_content'); // the actual message $page_owner = get_input("pageOwner"); // the message board owner $message_owner = get_input("guid"); // the user posting the message $user = get_entity($page_owner); // the commentwall owner details - + // Let's see if we can get a user entity from the specified page_owner if ($user && !empty($message_content)) { - + // If posting the comment was successful, say so if ($user->annotate('commentwall',$message_content,$user->access_id, get_loggedin_userid())) { - + global $CONFIG; - + if ($user->getGUID() != get_loggedin_userid()) - notify_user($user->getGUID(), get_loggedin_userid(), elgg_echo('profile:comment:subject'), - sprintf( - elgg_echo('profile:comment:body'), + notify_user($user->getGUID(), get_loggedin_userid(), elgg_echo('profile:comment:subject'), + elgg_echo('profile:comment:body', array( get_loggedin_user()->name, $message_content, elgg_get_site_url() . "pg/profile/" . $user->username, get_loggedin_user()->name, get_loggedin_user()->getURL() - ) - ); - - system_message(elgg_echo("profile:commentwall:posted")); - // add to river - add_to_river('river/object/profile/commentwall/create','commentwall',get_loggedin_userid(),$user->guid); - + )) + ); + + system_message(elgg_echo("profile:commentwall:posted")); + // add to river + add_to_river('river/object/profile/commentwall/create','commentwall',get_loggedin_userid(),$user->guid); + } else { register_error(elgg_echo("profile:commentwall:failure")); } - + } else { register_error(elgg_echo("profile:commentwall:blank")); } - + // Forward back to the messageboard forward(REFERER);
\ No newline at end of file diff --git a/mod/profile/actions/edit.php b/mod/profile/actions/edit.php index c91e5e5a7..f3c928cef 100644 --- a/mod/profile/actions/edit.php +++ b/mod/profile/actions/edit.php @@ -46,7 +46,7 @@ foreach($CONFIG->profile as $shortname => $valuetype) { // limit to reasonable sizes. if (!is_array($value) && $valuetype != 'longtext' && elgg_strlen($value) > 250) { - $error = sprintf(elgg_echo('profile:field_too_long'), elgg_echo("profile:{$shortname}")); + $error = elgg_echo('profile:field_too_long', array(elgg_echo("profile:{$shortname}"))); register_error($error); forward(REFERER); } @@ -103,7 +103,7 @@ if (sizeof($input) > 0) { //add to river if edited by self if (get_loggedin_userid() == $user->guid) { add_to_river('river/user/default/profileupdate','update',get_loggedin_userid(),get_loggedin_userid(),get_default_access(get_loggedin_user())); - } + } system_message(elgg_echo("profile:saved")); } |