Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

prep_atom_text_construct() and before_last_bar() should strictly check against false when using str(r)?pos().

Browse Source 
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
This commit is contained in:
Scott Taylor 2015-06-25 16:49:25 +00:00
parent 7453d12390
commit b9e8ee95b5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/feed.php
View File

@ -580,7 +580,7 @@ function prep_atom_text_construct($data) {
} }
} }
if (strpos($data, ']]>') == false) { if (strpos($data, ']]>') === false) {
return array('html', "<![CDATA[$data]]>"); return array('html', "<![CDATA[$data]]>");
} else { } else {
return array('html', htmlspecialchars($data)); return array('html', htmlspecialchars($data));

2
wp-includes/l10n.php
View File

@ -116,7 +116,7 @@ function translate( $text, $domain = 'default' ) {
*/ */
function before_last_bar( $string ) { function before_last_bar( $string ) {
$last_bar = strrpos( $string, '|' ); $last_bar = strrpos( $string, '|' );
if ( false == $last_bar ) if ( false === $last_bar )
return $string; return $string;
else else
return substr( $string, 0, $last_bar ); return substr( $string, 0, $last_bar );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.