ofco/medicalalert-web-reloaded
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in feature/314-dev-dev01 (pull request #24)

Browse Source 
auto-patch  314-dev-dev01-2024-01-25T04_09_02

* auto-patch  314-dev-dev01-2024-01-25T04_09_02
This commit is contained in:
Tony Volpe
2024-01-25 04:11:47 +00:00
parent 6b67473553
commit 68dbe860e9
540 changed files with 3445 additions and 2131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wp/wp-content/plugins/wordpress-seo/admin/class-plugin-conflict.php
View File

@@ -20,7 +20,7 @@ class WPSEO_Plugin_Conflict extends Yoast_Plugin_Conflict {
*
* NOTE: when changing this array, be sure to update the array in Conflicting_Plugins_Service too.
*
* @var array
* @var array<string, array<string>>
*/
protected $plugins = [
// The plugin which are writing OG metadata.
@@ -37,7 +37,7 @@ class WPSEO_Plugin_Conflict extends Yoast_Plugin_Conflict {
*
* @return Yoast_Plugin_Conflict
*/
public static function get_instance( $class_name = __CLASS__ ) {
public static function get_instance( $class_name = self::class ) {
return parent::get_instance( $class_name );
}
@@ -47,6 +47,8 @@ class WPSEO_Plugin_Conflict extends Yoast_Plugin_Conflict {
* If the activated plugin is conflicting with ours a notice will be shown.
*
* @param string|bool $plugin Optional plugin basename to check.
*
* @return void
*/
public static function hook_check_for_plugin_conflicts( $plugin = false ) {
// The instance of the plugin.