From 959f377c3ed60c6dc55a35a44c0648481dee037b Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 16 Dec 2015 08:03:38 +0000 Subject: [PATCH] I18N: Add a unit test for `before_last_bar()`. Props realloc. Fixes #35073. git-svn-id: https://develop.svn.wordpress.org/trunk@35959 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/l10n.php | 5 +++-- tests/phpunit/tests/l10n.php | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/l10n.php b/src/wp-includes/l10n.php index 2a679128e5..53b3ab79a4 100644 --- a/src/wp-includes/l10n.php +++ b/src/wp-includes/l10n.php @@ -118,10 +118,11 @@ 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 + } else { return substr( $string, 0, $last_bar ); + } } /** diff --git a/tests/phpunit/tests/l10n.php b/tests/phpunit/tests/l10n.php index e4ff0a6c52..62357f0409 100644 --- a/tests/phpunit/tests/l10n.php +++ b/tests/phpunit/tests/l10n.php @@ -16,4 +16,14 @@ class Tests_L10n extends WP_UnitTestCase { $this->assertTrue( unload_textdomain( 'wp-tests-domain' ) ); $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) ); } + + /** + * @ticket 35073 + */ + function test_before_last_bar() { + $this->assertEquals( 'no-bar-at-all', before_last_bar( 'no-bar-at-all' ) ); + $this->assertEquals( 'before-last-bar', before_last_bar( 'before-last-bar|after-bar' ) ); + $this->assertEquals( 'first-before-bar|second-before-bar', before_last_bar( 'first-before-bar|second-before-bar|after-last-bar' ) ); + } + }