diff options
| author | Sem <sembrestels@riseup.net> | 2012-10-19 09:47:11 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-10-19 09:47:11 +0200 |
| commit | 80ca3d447737a679f773cbea7e788ee190abea69 (patch) | |
| tree | 62bd6ec58b5fc8ad02bd529d187591659dc39b65 /mod/groups | |
| parent | 9a4ed2014e9880130c1bbc52bb980e44a488bad9 (diff) | |
| parent | d134beadb79fcc90a75bda8bbcbfb9987b27470c (diff) | |
| download | elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.gz elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.bz2 | |
Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
Diffstat (limited to 'mod/groups')
| -rw-r--r-- | mod/groups/actions/discussion/save.php | 2 | ||||
| -rw-r--r-- | mod/groups/actions/groups/edit.php | 3 | ||||
| -rw-r--r-- | mod/groups/start.php | 9 |
3 files changed, 11 insertions, 3 deletions
diff --git a/mod/groups/actions/discussion/save.php b/mod/groups/actions/discussion/save.php index de4afadfb..b3e9da654 100644 --- a/mod/groups/actions/discussion/save.php +++ b/mod/groups/actions/discussion/save.php @@ -4,7 +4,7 @@ */ // Get variables -$title = get_input("title"); +$title = htmlspecialchars(get_input('title', '', false), ENT_QUOTES, 'UTF-8'); $desc = get_input("description"); $status = get_input("status"); $access_id = (int) get_input("access_id"); diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php index df2464a65..a4169461a 100644 --- a/mod/groups/actions/groups/edit.php +++ b/mod/groups/actions/groups/edit.php @@ -33,8 +33,7 @@ foreach ($CONFIG->group as $shortname => $valuetype) { } } -$input['name'] = get_input('name'); -$input['name'] = html_entity_decode($input['name'], ENT_COMPAT, 'UTF-8'); +$input['name'] = htmlspecialchars(get_input('name', '', false), ENT_QUOTES, 'UTF-8'); $user = elgg_get_logged_in_user_entity(); diff --git a/mod/groups/start.php b/mod/groups/start.php index c591410c5..9dca7dc16 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -194,6 +194,15 @@ function groups_setup_sidebar_menus() { */ function groups_page_handler($page) { + // forward old profile urls + if (is_numeric($page[0])) { + $group = get_entity($page[0]); + if (elgg_instanceof($group, 'group', '', 'ElggGroup')) { + system_message(elgg_echo('changebookmark')); + forward($group->getURL()); + } + } + elgg_load_library('elgg:groups'); if (!isset($page[0])) { |