search plugins first, themes second

Author: crstauf

classes/ActionScheduler_Versions.php

@@ -115,49 +115,49 @@ public static function initialize_latest_version() {
 	 * @return string
 	 */
 	public function active_source() {
-		$file   = __FILE__;
-		$dir    = __DIR__;
-		$themes = (array) search_theme_directories();
+		$file         = __FILE__;
+		$dir          = __DIR__;
+		$plugins      = get_plugins();
+		$plugin_files = array_keys( $plugins );
 
-		foreach ( $themes as $slug => $data ) {
-			$needle = trailingslashit( $data['theme_root'] ) . $slug . '/';
+		foreach ( $plugin_files as $plugin_file ) {
+			$plugin_path = trailingslashit( WP_PLUGIN_DIR ) . dirname( $plugin_file );
+			$plugin_file = trailingslashit( WP_PLUGIN_DIR ) . $plugin_file;
 
-			if ( 0 !== strpos( $file, $needle ) ) {
+			if ( 0 !== strpos( dirname( $dir ), $plugin_path ) ) {
 				continue;
 			}
 
-			$theme = wp_get_theme( $slug );
+			$plugin_data = get_plugin_data( $plugin_file );
 
-			if ( ! is_object( $theme ) || ! is_a( $theme, \WP_Theme::class ) ) {
+			if ( ! is_array( $plugin_data ) || empty( $plugin_data['Name'] ) ) {
 				continue;
 			}
 
 			return array(
-				'type' => 'theme',
-				'name' => $theme->Name,
+				'type' => 'plugin',
+				'name' => $plugin_data['Name'],
 			);
 		}
 
-		$plugins      = get_plugins();
-		$plugin_files = array_keys( $plugins );
+		$themes = (array) search_theme_directories();
 
-		foreach ( $plugin_files as $plugin_file ) {
-			$plugin_path = trailingslashit( WP_PLUGIN_DIR ) . dirname( $plugin_file );
-			$plugin_file = trailingslashit( WP_PLUGIN_DIR ) . $plugin_file;
+		foreach ( $themes as $slug => $data ) {
+			$needle = trailingslashit( $data['theme_root'] ) . $slug . '/';
 
-			if ( 0 !== strpos( dirname( $dir ), $plugin_path ) ) {
+			if ( 0 !== strpos( $file, $needle ) ) {
 				continue;
 			}
 
-			$plugin_data = get_plugin_data( $plugin_file );
+			$theme = wp_get_theme( $slug );
 
-			if ( ! is_array( $plugin_data ) || empty( $plugin_data['Name'] ) ) {
+			if ( ! is_object( $theme ) || ! is_a( $theme, \WP_Theme::class ) ) {
 				continue;
 			}
 
 			return array(
-				'type' => 'plugin',
-				'name' => $plugin_data['Name'],
+				'type' => 'theme',
+				'name' => $theme->Name,
 			);
 		}