From 1244eaff8fb2ab31294c8b10ec75a2f9744c3668 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Thu, 26 May 2016 23:15:31 +0000 Subject: [PATCH] Plugins: Fix order of arguments for the `strpos()` function added in [37562]. See #36706. Built from https://develop.svn.wordpress.org/trunk@37580 git-svn-id: http://core.svn.wordpress.org/trunk@37548 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 74345c41d6..b0341dcf6a 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -95,7 +95,7 @@ function get_plugin_data( $plugin_file, $markup = true, $translate = true ) { // If no text domain is defined fall back to the plugin slug. if ( ! $plugin_data['TextDomain'] ) { $plugin_slug = dirname( plugin_basename( $plugin_file ) ); - if ( '.' !== $plugin_slug && false === strpos( '/', $plugin_slug ) ) { + if ( '.' !== $plugin_slug && false === strpos( $plugin_slug, '/' ) ) { $plugin_data['TextDomain'] = $plugin_slug; } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 0db37a10c5..012b1e72a3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37579'; +$wp_version = '4.6-alpha-37580'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.