Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotfix: Prevent PHP fatal error when trying to delete a term #2650

Merged
merged 3 commits into from May 14, 2020
Merged

Hotfix: Prevent PHP fatal error when trying to delete a term #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f0300c
use delete_term instead of pre_delete_term hook
Tabrisrp May 14, 2020
2705277
update tests
Tabrisrp May 14, 2020
d4dc755
adjust coding standard
engahmeds3ed May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions inc/Engine/Cache/PurgeActionsSubscriber.php
View file
Open in desktop
Expand Up @@ -31,11 +31,11 @@ public function __construct( Options_Data $options ) {
*/
public static function get_subscribed_events() {
return [
'profile_update' => 'purge_user_cache',
'delete_user' => 'purge_user_cache',
'create_term' => [ 'maybe_purge_cache_on_term_change', 10, 3 ],
'edit_term' => [ 'maybe_purge_cache_on_term_change', 10, 3 ],
'pre_delete_term' => [ 'maybe_purge_cache_on_term_change', 10, 3 ],
'profile_update' => 'purge_user_cache',
'delete_user' => 'purge_user_cache',
'create_term' => [ 'maybe_purge_cache_on_term_change', 10, 3 ],
'edit_term' => [ 'maybe_purge_cache_on_term_change', 10, 3 ],
'delete_term' => [ 'maybe_purge_cache_on_term_change', 10, 3 ],
];
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/inc/Engine/Cache/PurgeActionsSubscriber/maybePurgeCacheOnTermChange.php
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
'action' => 'edit_term',
],
'testDeleteTerm' => [
'action' => 'pre_delete_term',
'action' => 'delete_term',
],
],
'unit_test_data' => [
Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/inc/Engine/Cache/PurgeActionsSubscriber/maybePurgeCacheOnTermChange.php
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ public static function wpSetUpBeforeClass( $factory ) {
public function testShouldNotPurgeCacheWhenTaxonomyNotPublic() {
do_action( 'create_term', self::$not_public_term->term_id, self::$not_public_term->term_taxonomy_id, self::$not_public_term->taxonomy );
do_action( 'edit_term', self::$not_public_term->term_id, self::$not_public_term->term_taxonomy_id, self::$not_public_term->taxonomy );
do_action( 'pre_delete_term', self::$not_public_term->term_id, self::$not_public_term->term_taxonomy_id, self::$not_public_term->taxonomy );
do_action( 'delete_term', self::$not_public_term->term_id, self::$not_public_term->term_taxonomy_id, self::$not_public_term->taxonomy );

// Check no files were deleted.
foreach( $this->original_files as $file ) {
Expand Down