aboutsummaryrefslogtreecommitdiff
path: root/mod/pages/index.php
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-20 11:15:00 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-20 11:15:00 +0000
commit81c1ee6e7d08ece79919fe7fd438f07f89d00eed (patch)
treed2c370e310eb7d63f4426b160f0974e4af244f41 /mod/pages/index.php
parent72961826b01e7e67533f16bd0c2a943695dc6a86 (diff)
downloadelgg-81c1ee6e7d08ece79919fe7fd438f07f89d00eed.tar.gz
elgg-81c1ee6e7d08ece79919fe7fd438f07f89d00eed.tar.bz2
Refs #2496 - manually merged [6975] from 1.7 branch
git-svn-id: http://code.elgg.org/elgg/trunk@7102 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/pages/index.php')
-rw-r--r--mod/pages/index.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/pages/index.php b/mod/pages/index.php
index 93e3428d5..2afae36df 100644
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -17,7 +17,7 @@ if (!($owner instanceof ElggGroup)) {
}
if (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){
add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . page_owner(), 'pagesactions');
- if ($owner instanceof ElggUser) add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/", 'pagesactions');
+ add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/" . $owner->username, 'pagesactions');
}
// access check for closed groups
@@ -43,7 +43,7 @@ $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top
set_context($context);
//get the owners latest welcome message
-$welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'owner_guid' => $owner->guid, 'limit' => 1));
+$welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'container_guid' => $owner->guid, 'limit' => 1));
$body = elgg_view_title($title);
$body .= elgg_view("pages/welcome", array('entity' => $welcome_message));