diff options
| -rw-r--r-- | engine/lib/pageowner.php | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/engine/lib/pageowner.php b/engine/lib/pageowner.php index c9e85d22f..c7ec0b52b 100644 --- a/engine/lib/pageowner.php +++ b/engine/lib/pageowner.php @@ -112,37 +112,35 @@ function default_page_owner_handler($hook, $entity_type, $returnvalue, $params) } } - $uri = $_SERVER['REQUEST_URI']; - // ignore the query - $parts = parse_url($uri); - - if ($parts && isset($parts['path'])) { - $path = $parts['path']; - } else { - return $returnvalue; - } - - if (strpos($path, '/pg') === 0) { + // ignore root and query + $uri = current_page_url(); + $path = str_replace(elgg_get_site_url(), '', $uri); + $path = trim($path, "/"); + if (strpos($path, "?")) { + $path = substr($path, 0, strpos($path, "?")); + } + + if (strpos($path, 'pg') === 0) { $segments = explode('/', $path); - if (isset($segments[3]) && isset($segments[4])) { - switch ($segments[3]) { + if (isset($segments[2]) && isset($segments[3])) { + switch ($segments[2]) { case 'owner': case 'friends': - $user = get_user_by_username($segments[4]); + $user = get_user_by_username($segments[3]); if ($user) { return $user->getGUID(); } break; case 'view': case 'edit': - $entity = get_entity($segments[4]); + $entity = get_entity($segments[3]); if ($entity) { return $entity->getContainerGUID(); } break; case 'add': case 'group': - $entity = get_entity($segments[4]); + $entity = get_entity($segments[3]); if ($entity) { return $entity->getGUID(); } |