Merge pull request #687 from wp-stream/issue-686

Hook load methods on init rather than plugins_loaded

Author: frankiejarrett

extensions/notifications/class-wp-stream-notifications.php

@@ -75,7 +75,7 @@ private function __construct() {
 			return;
 		}
 
-		add_action( 'plugins_loaded', array( $this, 'load' ) );
+		add_action( 'init', array( $this, 'load' ) );
 
 		// Register post type
 		require_once WP_STREAM_NOTIFICATIONS_INC_DIR . 'class-wp-stream-notifications-post-type.php';

extensions/reports/class-wp-stream-reports.php

@@ -54,7 +54,7 @@ private function __construct() {
 			return;
 		}
 
-		add_action( 'plugins_loaded', array( $this, 'load' ) );
+		add_action( 'init', array( $this, 'load' ) );
 	}
 
 	/**

stream.php

@@ -134,15 +134,11 @@ private function __construct() {
 		add_action( 'wp_head', array( $this, 'frontend_indicator' ) );
 
 		if ( is_admin() ) {
-			add_action( 'plugins_loaded', array( 'WP_Stream_Admin', 'load' ) );
-
-			add_action( 'plugins_loaded', array( 'WP_Stream_Dashboard_Widget', 'load' ) );
-
-			add_action( 'plugins_loaded', array( 'WP_Stream_Live_Update', 'load' ) );
-
-			add_action( 'plugins_loaded', array( 'WP_Stream_Pointers', 'load' ) );
-
-			add_action( 'plugins_loaded', array( 'WP_Stream_Migrate', 'load' ) );
+			add_action( 'init', array( 'WP_Stream_Admin', 'load' ) );
+			add_action( 'init', array( 'WP_Stream_Dashboard_Widget', 'load' ) );
+			add_action( 'init', array( 'WP_Stream_Live_Update', 'load' ) );
+			add_action( 'init', array( 'WP_Stream_Pointers', 'load' ) );
+			add_action( 'init', array( 'WP_Stream_Migrate', 'load' ) );
 		}
 	}