diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/avatar/view.php | 12 | ||||
| -rw-r--r-- | pages/entities/index.php | 2 | ||||
| -rw-r--r-- | pages/friends/collections/add.php | 4 | ||||
| -rw-r--r-- | pages/friends/collections/pickercallback.php | 4 | ||||
| -rw-r--r-- | pages/friends/collections/view.php | 8 | ||||
| -rw-r--r-- | pages/friends/index.php | 4 | ||||
| -rw-r--r-- | pages/friends/of.php | 4 | ||||
| -rw-r--r-- | pages/river.php | 9 |
8 files changed, 22 insertions, 25 deletions
diff --git a/pages/avatar/view.php b/pages/avatar/view.php index 55ae00e16..eb2cd1010 100644 --- a/pages/avatar/view.php +++ b/pages/avatar/view.php @@ -13,9 +13,9 @@ if (!in_array($size, array('master', 'large', 'medium', 'small', 'tiny', 'topbar // If user doesn't exist, return default icon if (!$user) { - $path = elgg_view("icon/user/default/$size"); - header("Location: $path"); - exit; + $url = "_graphics/icons/user/default{$size}"; + $url = elgg_normalize_url($url); + forward($url); } // Try and get the icon @@ -31,9 +31,9 @@ if ($filehandler->open("read")) { } if (!$success) { - $path = elgg_view('icon/user/default/'.$size); - header("Location: {$path}"); - exit; + $url = "_graphics/icons/user/default{$size}"; + $url = elgg_normalize_url($url); + forward($url); } header("Content-type: image/jpeg"); diff --git a/pages/entities/index.php b/pages/entities/index.php index 13aea9e5a..d3b935dc4 100644 --- a/pages/entities/index.php +++ b/pages/entities/index.php @@ -36,7 +36,7 @@ if ($entity = get_entity($guid)) { } else if ($entity instanceof ElggEntity) { $title = $entity->name; } - $area1 = elgg_view_entity($entity, true); + $area1 = elgg_view_entity($entity, array('full_view' => true)); if ($shell) { $body = elgg_view_layout('one_column', array('content' => $area1)); } else { diff --git a/pages/friends/collections/add.php b/pages/friends/collections/add.php index 0bc3f1fcb..60f7586ba 100644 --- a/pages/friends/collections/add.php +++ b/pages/friends/collections/add.php @@ -2,8 +2,8 @@ /** * Elgg add a collection of friends * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Collections */ // You need to be logged in for this one diff --git a/pages/friends/collections/pickercallback.php b/pages/friends/collections/pickercallback.php index 228037590..c6ed61cf0 100644 --- a/pages/friends/collections/pickercallback.php +++ b/pages/friends/collections/pickercallback.php @@ -2,8 +2,8 @@ /** * Elgg friends picker callback * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Collections */ // Load Elgg engine diff --git a/pages/friends/collections/view.php b/pages/friends/collections/view.php index fa7527f4d..0d72fe788 100644 --- a/pages/friends/collections/view.php +++ b/pages/friends/collections/view.php @@ -2,14 +2,12 @@ /** * Elgg collections of friends * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Collections */ -// You need to be logged in for this one -gatekeeper(); - $title = elgg_echo('friends:collections'); +elgg_register_title_button('collections', 'add'); $content = elgg_view_access_collections(elgg_get_logged_in_user_guid()); diff --git a/pages/friends/index.php b/pages/friends/index.php index 84c0fa526..707402c64 100644 --- a/pages/friends/index.php +++ b/pages/friends/index.php @@ -2,8 +2,8 @@ /** * Elgg friends page * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Friends */ $owner = elgg_get_page_owner_entity(); diff --git a/pages/friends/of.php b/pages/friends/of.php index 7091c4445..5bbfa6dff 100644 --- a/pages/friends/of.php +++ b/pages/friends/of.php @@ -2,8 +2,8 @@ /** * Elgg friends of page * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Friends */ $owner = elgg_get_page_owner_entity(); diff --git a/pages/river.php b/pages/river.php index 7f2fce3d6..5770084ab 100644 --- a/pages/river.php +++ b/pages/river.php @@ -3,12 +3,12 @@ * Main activity stream list page */ -// $page_type comes from the page handler function - $options = array(); -$type = get_input('type', 'all'); -$subtype = get_input('subtype', ''); +$page_type = preg_replace('[\W]', '', get_input('page_type', 'all')); +$type = preg_replace('[\W]', '', get_input('type', 'all')); +$active_section = +$subtype = preg_replace('[\W]', '', get_input('subtype', '')); if ($subtype) { $selector = "type=$type&subtype=$subtype"; } else { @@ -49,7 +49,6 @@ $sidebar = elgg_view('core/river/sidebar'); $params = array( 'content' => $content . $activity, 'sidebar' => $sidebar, - 'buttons' => '', 'filter_context' => $page_filter, 'class' => 'elgg-river-layout', ); |