diff options
Diffstat (limited to 'mod/groups')
| -rw-r--r-- | mod/groups/actions/addtogroup.php | 8 | ||||
| -rw-r--r-- | mod/groups/actions/edit.php | 2 | ||||
| -rw-r--r-- | mod/groups/actions/joinrequest.php | 4 | ||||
| -rw-r--r-- | mod/groups/languages/en.php | 2 | ||||
| -rw-r--r-- | mod/groups/start.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/forms/groups/invite.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/groupgallery.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/grouplisting.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/groupprofile.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/river/ElggRelationship/create.php | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php index 10aea2880..1910a8196 100644 --- a/mod/groups/actions/addtogroup.php +++ b/mod/groups/actions/addtogroup.php @@ -47,8 +47,8 @@ // send welcome email notify_user($user->getGUID(), $group->owner_guid, - sprintf(elgg_echo('groups:welcome:subject'), $group->title), - sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->title, $group->getURL()), + sprintf(elgg_echo('groups:welcome:subject'), $group->name), + sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->name, $group->getURL()), NULL, "email"); system_message(elgg_echo('groups:addedtogroup')); @@ -80,8 +80,8 @@ { // Send email if (notify_user($user->getGUID(), $group->owner_guid, - sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->title), - sprintf(elgg_echo('groups:invite:body'), $user->name, $group->title, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"), + sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name), + sprintf(elgg_echo('groups:invite:body'), $user->name, $group->name, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"), NULL, "email")) system_message(elgg_echo("groups:userinvited")); else diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php index 75ae1f80f..d7c1833a5 100644 --- a/mod/groups/actions/edit.php +++ b/mod/groups/actions/edit.php @@ -46,7 +46,7 @@ } // Validate create - if (!$group->title) + if (!$group->name) { register_error(elgg_echo("groups:notitle")); diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php index 3539221fe..bbe896342 100644 --- a/mod/groups/actions/joinrequest.php +++ b/mod/groups/actions/joinrequest.php @@ -70,8 +70,8 @@ // Send email if (notify_user($group->owner_guid, $user->getGUID(), - sprintf(elgg_echo('groups:request:subject'), $user->name, $group->title), - sprintf(elgg_echo('groups:request:body'), $group->getOwner()->name, $user->name, $group->title, $user->getURL(), "{$CONFIG->url}action/groups/addtogroup?user_guid={$user->guid}&group_guid={$group->guid}"), + sprintf(elgg_echo('groups:request:subject'), $user->name, $group->name), + sprintf(elgg_echo('groups:request:body'), $group->getOwner()->name, $user->name, $group->name, $user->getURL(), "{$CONFIG->url}action/groups/addtogroup?user_guid={$user->guid}&group_guid={$group->guid}"), NULL, "email")) system_message(elgg_echo("groups:joinrequestmade")); else diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index 753dd2c5d..4aafe7b57 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -23,7 +23,7 @@ 'groups:edit' => "Edit a group", 'groups:icon' => 'Group icon (leave blank to leave unchanged)', - 'groups:title' => 'Group title', + 'groups:name' => 'Group name', 'groups:description' => 'Description', 'groups:interests' => 'Interests', 'groups:website' => 'Website', diff --git a/mod/groups/start.php b/mod/groups/start.php index 58aa50d15..333f1ee90 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -144,7 +144,7 @@ global $CONFIG; - $title = friendly_title($entity->title); + $title = friendly_title($entity->name); return $CONFIG->url . "pg/groups/{$entity->guid}/$title/"; diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php index 055bb738b..63f5f6c95 100644 --- a/mod/groups/views/default/forms/groups/invite.php +++ b/mod/groups/views/default/forms/groups/invite.php @@ -15,7 +15,7 @@ ?> -<h2><?php echo sprintf(elgg_echo('groups:inviteto'), $group->title); ?></h2> +<h2><?php echo sprintf(elgg_echo('groups:inviteto'), $group->name); ?></h2> <form action="<?php echo $vars['url']; ?>action/groups/addtogroup" method="post"> <?php diff --git a/mod/groups/views/default/groups/groupgallery.php b/mod/groups/views/default/groups/groupgallery.php index 14ca2f95f..ac9bcc102 100644 --- a/mod/groups/views/default/groups/groupgallery.php +++ b/mod/groups/views/default/groups/groupgallery.php @@ -16,7 +16,7 @@ ) ); - $info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->title . "</a></b></p>"; + $info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></b></p>"; // num users, last activity, owner etc diff --git a/mod/groups/views/default/groups/grouplisting.php b/mod/groups/views/default/groups/grouplisting.php index 1c86f2279..ab85731ae 100644 --- a/mod/groups/views/default/groups/grouplisting.php +++ b/mod/groups/views/default/groups/grouplisting.php @@ -18,7 +18,7 @@ ) ); - $info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->title . "</a></b></p>"; + $info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></b></p>"; // num users, last activity, owner etc diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php index 923c07b3e..c8e48ebed 100644 --- a/mod/groups/views/default/groups/groupprofile.php +++ b/mod/groups/views/default/groups/groupprofile.php @@ -46,7 +46,7 @@ <div id="groups_info_column_right"> <?php - echo "<h2><a href=\"" . $vars['entity']->getURL() . "\">" . $vars['entity']->title . "</a></h2> <br />"; + echo "<h2><a href=\"" . $vars['entity']->getURL() . "\">" . $vars['entity']->name . "</a></h2> <br />"; ?> diff --git a/mod/groups/views/default/river/ElggRelationship/create.php b/mod/groups/views/default/river/ElggRelationship/create.php index 169a9b2aa..8dbbf961f 100644 --- a/mod/groups/views/default/river/ElggRelationship/create.php +++ b/mod/groups/views/default/river/ElggRelationship/create.php @@ -29,7 +29,7 @@ { echo "<a href=\"{$user->getURL()}\">{$user->name}</a> "; echo elgg_echo("groups:river:member"); - echo " '<a href=\"{$group->getURL()}\">{$group->title}</a>'"; + echo " '<a href=\"{$group->getURL()}\">{$group->name}</a>'"; } break; |