aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2013-02-21 10:21:33 -0500
committerBrett Profitt <brett.profitt@gmail.com>2013-02-21 10:21:33 -0500
commit88b7f8a3a32542e8b016c2163f44e1ebce7211fc (patch)
tree5498e58412fc147cf4b07acec526ecfab4eb844c /mod
parent1014ea146b6ef913beb1a029127965beccc05797 (diff)
parentc42e0a6f66c013ba971be6ff8eed2efe1749d225 (diff)
downloadelgg-88b7f8a3a32542e8b016c2163f44e1ebce7211fc.tar.gz
elgg-88b7f8a3a32542e8b016c2163f44e1ebce7211fc.tar.bz2
Merge branch '1.8' of github.com:Elgg/Elgg into 1.8
Diffstat (limited to 'mod')
-rw-r--r--mod/groups/actions/groups/edit.php12
-rw-r--r--mod/groups/views/default/groups/css.php2
2 files changed, 13 insertions, 1 deletions
diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index d0689be2e..632a6412b 100644
--- a/mod/groups/actions/groups/edit.php
+++ b/mod/groups/actions/groups/edit.php
@@ -54,6 +54,18 @@ if ($group_guid && !$group->canEdit()) {
// Assume we can edit or this is a new group
if (sizeof($input) > 0) {
foreach($input as $shortname => $value) {
+ // update access collection name ig group name changes
+ if (!$is_new_group && $shortname == 'name' && $value != $group->name) {
+ $ac_name = elgg_echo('groups:group') . ": " . $group->name;
+ $acl = get_access_collection($group->group_acl);
+ if ($acl) {
+ // @todo Elgg api does not support updating access collection name
+ $db_prefix = elgg_get_config('dbprefix');
+ $query = "UPDATE {$db_prefix}access_collections SET name = '$ac_name'";
+ update_data($query);
+ }
+ }
+
$group->$shortname = $value;
}
}
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 6f710ddab..39246f856 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -9,7 +9,7 @@
.groups-profile > .elgg-image {
margin-right: 10px;
}
-.groups-profile img {
+.groups-profile-icon img {
width: 100%;
height: auto;
}