diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-20 23:06:35 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-20 23:06:35 +0000 |
| commit | 1429e80a1276a9081e4148076e2eac588e55a439 (patch) | |
| tree | 9ebe52aa7a5c056a014187f39a6dc31c730833e7 /mod/file | |
| parent | 02bf9ae5522c752aaa7bfac9b9562c634d35cef4 (diff) | |
| download | elgg-1429e80a1276a9081e4148076e2eac588e55a439.tar.gz elgg-1429e80a1276a9081e4148076e2eac588e55a439.tar.bz2 | |
Fixes #2970 updated groups, file, pages, and wire plugins for automatic page owner setting
git-svn-id: http://code.elgg.org/elgg/trunk@8376 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/file')
| -rw-r--r-- | mod/file/index.php | 2 | ||||
| -rw-r--r-- | mod/file/start.php | 7 | ||||
| -rw-r--r-- | mod/file/upload.php | 1 | ||||
| -rw-r--r-- | mod/file/view.php | 3 |
4 files changed, 2 insertions, 11 deletions
diff --git a/mod/file/index.php b/mod/file/index.php index ad5f4378c..257dd8af8 100644 --- a/mod/file/index.php +++ b/mod/file/index.php @@ -5,8 +5,6 @@ * @package ElggFile */ -elgg_set_page_owner_guid(get_input('guid')); - // access check for closed groups group_gatekeeper(); diff --git a/mod/file/start.php b/mod/file/start.php index a70267e47..765ef6b01 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -8,7 +8,7 @@ elgg_register_event_handler('init', 'system', 'file_init'); /** - * File plugin initialisation functions. + * File plugin initialization functions. */ function file_init() { @@ -91,12 +91,9 @@ function file_page_handler($page) { $page_type = $page[0]; switch ($page_type) { case 'owner': - $owner = get_user_by_username($page[1]); - set_input('guid', $owner->guid); include "$file_dir/index.php"; break; case 'friends': - set_input('username', $page[1]); include "$file_dir/friends.php"; break; case 'view': @@ -104,7 +101,6 @@ function file_page_handler($page) { include "$file_dir/view.php"; break; case 'add': - set_input('guid', $page[1]); include "$file_dir/upload.php"; break; case 'edit': @@ -112,7 +108,6 @@ function file_page_handler($page) { include "$file_dir/edit.php"; break; case 'group': - set_input('guid', $page[1]); include "$file_dir/index.php"; break; case 'all': diff --git a/mod/file/upload.php b/mod/file/upload.php index f26b1bbee..9f0220b95 100644 --- a/mod/file/upload.php +++ b/mod/file/upload.php @@ -7,7 +7,6 @@ elgg_load_library('elgg:file'); -elgg_set_page_owner_guid(get_input('guid')); $owner = elgg_get_page_owner_entity(); gatekeeper(); diff --git a/mod/file/view.php b/mod/file/view.php index 72660c406..9e89fbd56 100644 --- a/mod/file/view.php +++ b/mod/file/view.php @@ -7,12 +7,11 @@ $file = get_entity(get_input('guid')); -elgg_set_page_owner_guid($file->getContainerGUID()); $owner = elgg_get_page_owner_entity(); elgg_push_breadcrumb(elgg_echo('file'), 'pg/file/all'); -$crumbs_title = elgg_echo('blog:owned_blogs', array($owner->name)); +$crumbs_title = $owner->name; if (elgg_instanceof($owner, 'group')) { elgg_push_breadcrumb($crumbs_title, "pg/file/group/$owner->guid/owner"); } else { |