Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use correct hooks and priorities for plugin conflict resolving

Browse Source 
[MAILPOET-2105]
This commit is contained in:
Jan Jakeš
2019-05-23 15:36:51 +02:00
committed by M. Shull
parent 0e8d864d95
commit c6f5eb943c
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Util/ConflictResolver.php
View File

@@ -77,10 +77,16 @@ class ConflictResolver {
} }
} }
}; };
WPFunctions::get()->addAction('wp_print_styles', $dequeue_styles, PHP_INT_MAX);
WPFunctions::get()->addAction('admin_print_styles', $dequeue_styles, PHP_INT_MAX); // execute last in the following hooks
WPFunctions::get()->addAction('admin_print_footer_scripts', $dequeue_styles, PHP_INT_MAX); $execute_last = PHP_INT_MAX;
WPFunctions::get()->addAction('admin_footer', $dequeue_styles, PHP_INT_MAX); WPFunctions::get()->addAction('admin_enqueue_scripts', $dequeue_styles, $execute_last); // used also for styles
WPFunctions::get()->addAction('admin_footer', $dequeue_styles, $execute_last);
// execute first in hooks for printing (after printing is too late)
$execute_first = defined('PHP_INT_MIN') ? constant('PHP_INT_MIN') : ~PHP_INT_MAX;
WPFunctions::get()->addAction('admin_print_styles', $dequeue_styles, $execute_first);
WPFunctions::get()->addAction('admin_print_footer_scripts', $dequeue_styles, $execute_first);
} }
function resolveScriptsConflict() { function resolveScriptsConflict() {
@@ -100,8 +106,15 @@ class ConflictResolver {
} }
} }
}; };
WPFunctions::get()->addAction('wp_print_scripts', $dequeue_scripts, PHP_INT_MAX);
WPFunctions::get()->addAction('admin_print_footer_scripts', $dequeue_scripts, PHP_INT_MAX); // execute last in the following hooks
WPFunctions::get()->addAction('admin_footer', $dequeue_scripts, PHP_INT_MAX); $execute_last = PHP_INT_MAX;
WPFunctions::get()->addAction('admin_enqueue_scripts', $dequeue_scripts, $execute_last);
WPFunctions::get()->addAction('admin_footer', $dequeue_scripts, $execute_last);
// execute first in hooks for printing (after printing is too late)
$execute_first = defined('PHP_INT_MIN') ? constant('PHP_INT_MIN') : ~PHP_INT_MAX;
WPFunctions::get()->addAction('admin_print_scripts', $dequeue_scripts, $execute_first);
WPFunctions::get()->addAction('admin_print_footer_scripts', $dequeue_scripts, $execute_first);
} }
} }