aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-02 12:25:40 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-02 12:25:40 +0000
commita2224165795320235ebe3505d048ff57f319f365 (patch)
tree5db548959906b527a29751b361ffccfb02ae00eb /mod
parenteafbdf2ffcb9f2496d77b697706230f116b12d6a (diff)
downloadelgg-a2224165795320235ebe3505d048ff57f319f365.tar.gz
elgg-a2224165795320235ebe3505d048ff57f319f365.tar.bz2
moved name out of configurable fields for a group
git-svn-id: http://code.elgg.org/elgg/trunk@7988 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/groups/actions/edit.php6
-rw-r--r--mod/groups/start.php3
-rw-r--r--mod/groups/views/default/forms/groups/edit.php8
3 files changed, 12 insertions, 5 deletions
diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php
index 216a22702..c8a68d238 100644
--- a/mod/groups/actions/edit.php
+++ b/mod/groups/actions/edit.php
@@ -26,14 +26,14 @@ foreach ($CONFIG->group as $shortname => $valuetype) {
$input[$shortname] = html_entity_decode($input[$shortname], ENT_COMPAT, 'UTF-8');
}
- if ($shortname == 'name') {
- $input[$shortname] = strip_tags($input[$shortname]);
- }
if ($valuetype == 'tags') {
$input[$shortname] = string_to_tag_array($input[$shortname]);
}
}
+$input['name'] = get_input('name');
+$input['name'] = html_entity_decode($input['name'], ENT_COMPAT, 'UTF-8');
+
$user = get_loggedin_user();
$group_guid = (int)get_input('group_guid');
diff --git a/mod/groups/start.php b/mod/groups/start.php
index c0fc90135..0b2926a18 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -103,11 +103,10 @@ function groups_init() {
function groups_fields_setup() {
$profile_defaults = array(
- 'name' => 'text',
'description' => 'longtext',
'briefdescription' => 'text',
'interests' => 'tags',
- //'website' => 'url',
+ //'website' => 'url',
);
$profile_defaults = elgg_trigger_plugin_hook('profile:fields', 'group', NULL, $profile_defaults);
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 453e3be2c..a5d5e21e5 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -17,6 +17,14 @@ if (isset($vars['entity'])) {
<label><?php echo elgg_echo("groups:icon"); ?></label><br />
<?php echo elgg_view("input/file", array('internalname' => 'icon')); ?>
</p>
+<p>
+ <label><?php echo elgg_echo("groups:name"); ?></label><br />
+ <?php echo elgg_view("input/text", array(
+ 'internalname' => 'name',
+ 'value' => $vars['entity']->name,
+ ));
+ ?>
+</p>
<?php
$group_profile_fields = elgg_get_config('group');