From b9e8ee95b55c8bbf22138236c0ca296c75808da7 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 25 Jun 2015 16:49:25 +0000 Subject: [PATCH] `prep_atom_text_construct()` and `before_last_bar()` should strictly check against `false` when using `str(r)?pos()`. Sidenote: there's a function named `before_last_bar`. See #32444. Built from https://develop.svn.wordpress.org/trunk@32940 git-svn-id: http://core.svn.wordpress.org/trunk@32911 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/feed.php | 2 +- wp-includes/l10n.php | 2 +- wp-includes/version.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/feed.php b/wp-includes/feed.php index 01e2c2427a..4554d0e461 100644 --- a/wp-includes/feed.php +++ b/wp-includes/feed.php @@ -580,7 +580,7 @@ function prep_atom_text_construct($data) { } } - if (strpos($data, ']]>') == false) { + if (strpos($data, ']]>') === false) { return array('html', ""); } else { return array('html', htmlspecialchars($data)); diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index c2d2713bbf..033310a88d 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -116,7 +116,7 @@ function translate( $text, $domain = 'default' ) { */ function before_last_bar( $string ) { $last_bar = strrpos( $string, '|' ); - if ( false == $last_bar ) + if ( false === $last_bar ) return $string; else return substr( $string, 0, $last_bar ); diff --git a/wp-includes/version.php b/wp-includes/version.php index b8f521a627..ab34d4c925 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32939'; +$wp_version = '4.3-alpha-32940'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.