aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-07-13 14:42:30 -0700
committerCash Costello <cash.costello@gmail.com>2012-07-13 14:42:30 -0700
commit901cb69ba0b40d247bea5b0e1b4e4588a86800c1 (patch)
tree219721ed17c67eae4a3e9ff946e756ffdd01e9d6
parent0b00af1e77d7ffc5c739f7fa21f61886b5480e62 (diff)
parentd6953c9955b2b9e3c245936e448e7be41058bb9b (diff)
downloadelgg-901cb69ba0b40d247bea5b0e1b4e4588a86800c1.tar.gz
elgg-901cb69ba0b40d247bea5b0e1b4e4588a86800c1.tar.bz2
Merge pull request #318 from sembrestels/handle-all
Fixes #4687. Handle URLs on plugins that include only handler name.
-rw-r--r--mod/bookmarks/start.php5
-rw-r--r--mod/groups/start.php8
-rw-r--r--mod/profile/start.php2
3 files changed, 15 insertions, 0 deletions
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 56bac984a..66e22b565 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -86,8 +86,13 @@ function bookmarks_init() {
* @return bool
*/
function bookmarks_page_handler($page) {
+
elgg_load_library('elgg:bookmarks');
+ if (!isset($page[0])) {
+ $page[0] = 'all';
+ }
+
elgg_push_breadcrumb(elgg_echo('bookmarks'), 'bookmarks/all');
// old group usernames
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 48df338c0..c591410c5 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -196,6 +196,10 @@ function groups_page_handler($page) {
elgg_load_library('elgg:groups');
+ if (!isset($page[0])) {
+ $page[0] = 'all';
+ }
+
elgg_push_breadcrumb(elgg_echo('groups'), "groups/all");
switch ($page[0]) {
@@ -785,6 +789,10 @@ function discussion_page_handler($page) {
elgg_load_library('elgg:discussion');
+ if (!isset($page[0])) {
+ $page[0] = 'all';
+ }
+
elgg_push_breadcrumb(elgg_echo('discussion'), 'discussion/all');
switch ($page[0]) {
diff --git a/mod/profile/start.php b/mod/profile/start.php
index abe044632..ab596f235 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -56,6 +56,8 @@ function profile_page_handler($page) {
$username = $page[0];
$user = get_user_by_username($username);
elgg_set_page_owner_guid($user->guid);
+ } elseif (elgg_is_logged_in()) {
+ forward(elgg_get_logged_in_user_entity()->getURL());
}
// short circuit if invalid or banned username