Merge pull request Yoast#1271 from jrfnl/Prevent-from-running-on-wp-i…

…nstall-when-in-mu Prevent from loading if WP is installing
mindingdata · Jul 3, 2014 · bb4321e · bb4321e
2 parents c51fd7d + 48cb21d
commit bb4321e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/wp-seo-main.php b/wp-seo-main.php
@@ -280,7 +280,7 @@ function wpseo_admin_init() {
 if ( ! function_exists( 'spl_autoload_register' ) ) {
 	add_action( 'admin_init', 'yoast_wpseo_self_deactivate', 1 );
 }
-else {
+else if ( ! defined( 'WP_INSTALLING' ) || WP_INSTALLING === false ) {
 	add_action( 'plugins_loaded', 'wpseo_init', 14 );
 
 	if ( is_admin() ) {