diff options
| -rw-r--r-- | engine/lib/user_settings.php | 4 | ||||
| -rw-r--r-- | mod/groups/actions/groups/edit.php | 12 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/css.php | 2 | ||||
| -rw-r--r-- | views/default/input/pulldown.php | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php index cca5359a4..3466c25f9 100644 --- a/engine/lib/user_settings.php +++ b/engine/lib/user_settings.php @@ -265,9 +265,9 @@ function elgg_set_user_default_access() { * @access private */ function usersettings_pagesetup() { - if (elgg_get_context() == "settings") { - $user = elgg_get_page_owner_entity(); + $user = elgg_get_page_owner_entity(); + if ($user && elgg_get_context() == "settings") { $params = array( 'name' => '1_account', 'text' => elgg_echo('usersettings:user:opt:linktext'), 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; } diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php index 705329691..fc0595300 100644 --- a/views/default/input/pulldown.php +++ b/views/default/input/pulldown.php @@ -5,5 +5,5 @@ * @deprecated 1.8 */ -elgg_deprecated_notice("input/pulldown was deprecated by input/dropdown", 1.8); +elgg_deprecated_notice("input/pulldown was deprecated by input/dropdown", 1.8, 2); echo elgg_view('input/dropdown', $vars); |