WIP Create friends ACL and get rid of ACCESS_FRIENDS #11387
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jdalsem
changed the title
jeabakker
requested changes
Nov 10, 2017
engine/classes/ElggEntity.php
Outdated
| * @since 3.0 | ||
| */ | ||
| public function getOwnedAccessCollection($subtype) { | ||
| if (!is_string($subtype)) { |
engine/classes/ElggEntity.php
Outdated
| @@ -1301,7 +1323,11 @@ protected function create() { | |||
| $container_guid = (int) $container_guid; | |||
|
|
|||
| if ($access_id == ACCESS_DEFAULT) { | |||
| throw new \InvalidParameterException('ACCESS_DEFAULT is not a valid access level. See its documentation in elgglib.h'); | |||
| throw new \InvalidParameterException('ACCESS_DEFAULT is not a valid access level. See its documentation in elgglib.php'); | |||
There was a problem hiding this comment.
not elgglib.php but in constants.php ....
engine/lib/access.php
Outdated
| * @param \Elgg\Event $event event | ||
| * | ||
| * @return void | ||
| */ |
| @@ -531,5 +631,11 @@ function access_test($hook, $type, $value, $params) { | |||
| // and the user is logged in so it can start caching | |||
| $events->registerHandler('ready', 'system', 'access_init'); | |||
|
|
|||
| // friends ACL events | |||
| $events->registerHandler('create', 'user', 'access_friends_acl_create'); | |||
There was a problem hiding this comment.
check if create:after is available
Using composer to call the (un)seeding script can cause timeouts, calling the script direclty avoids this issue.
chore(seeding): process faker image from local file
chore(core): support parent function arguments in ElggSite::delete
jdalsem
force-pushed
the
friends_acl_last_time
branch
from
6f9cec1
to
6d265b1
Compare
jdalsem
force-pushed
the
friends_acl_last_time
branch
from
6d265b1
to
5f8d11e
Compare
Conflicts: .travis.yml composer.json engine/classes/Elgg/Database/Seeds/Seed.php engine/classes/ElggSite.php
Upmerge 2.3 into master
fix(i18n): fallback to site language before English
chore(groups): fixed dropdown content for owner transfer
feat(discussion): replies have been moved to comments
…er-menu chore(developers): restore entity_explorer menu item
feat(forms): form_vars and body_vars are now available in the footer
All usages have been replaced by explicit `order_by` values. Fixes Elgg#11460 BREAKING CHANGE: `reverse_order_by` in $options is ignored.
chore(sql): removes reverse_order_by query option
Small master fixes
Friendly time
chore(groups): removed old upgrade file
fix(views): clean up of class attribute usage
feat(tests): travis now also test on PHP 7.2
chore(i18n): plugin translations have been cleaned
Implements a new theme BREAKING CHANGE Most of the CSS has been rewritten, which will probably affect plugins and themes. Plugins will need to adapt to new styling guidelines. Fixes Elgg#11134 Fixes Elgg#10201 Fixes Elgg#7658 Fixes Elgg#10857 Fixes Elgg#10316 Fixes Elgg#4762 Fixes Elgg#11245 Fixes Elgg#6912
chore(search): updated usage of elgg_search in plugins
chore(tests): report code coverage to scrutinizer
feat(theme): improve the design
Theme fixes
into friends_acl_last_time Conflicts: docs/appendix/upgrade-notes/2.x-to-3.0.rst
|
grr... going to redo this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3391, #5038
Refs #8073, #3872