From 24650cbd681d37e7a8be18447ee5c3be2d6a8a2b Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 2 Nov 2019 20:49:01 +0000 Subject: [PATCH] Code Modernization: Call PHP 5 constructors in methods extending `POMO_Reader`. Follow-up to [46629]. See #48252. Built from https://develop.svn.wordpress.org/trunk@46632 git-svn-id: http://core.svn.wordpress.org/trunk@46432 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/pomo/streams.php | 8 ++++---- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/pomo/streams.php b/wp-includes/pomo/streams.php index 0eeaa0f8e6..07edcc2cd0 100644 --- a/wp-includes/pomo/streams.php +++ b/wp-includes/pomo/streams.php @@ -149,7 +149,7 @@ if ( ! class_exists( 'POMO_FileReader', false ) ) : * @param string $filename */ function __construct( $filename ) { - parent::POMO_Reader(); + parent::__construct(); $this->_f = fopen( $filename, 'rb' ); } @@ -232,7 +232,7 @@ if ( ! class_exists( 'POMO_StringReader', false ) ) : * PHP5 constructor. */ function __construct( $str = '' ) { - parent::POMO_Reader(); + parent::__construct(); $this->_str = $str; $this->_pos = 0; } @@ -300,7 +300,7 @@ if ( ! class_exists( 'POMO_CachedFileReader', false ) ) : * PHP5 constructor. */ function __construct( $filename ) { - parent::POMO_StringReader(); + parent::__construct(); $this->_str = file_get_contents( $filename ); if ( false === $this->_str ) { return false; @@ -331,7 +331,7 @@ if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ) : * PHP5 constructor. */ public function __construct( $filename ) { - parent::POMO_CachedFileReader( $filename ); + parent::__construct( $filename ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index cb277e8a7e..f03905dc32 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-46631'; +$wp_version = '5.4-alpha-46632'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.