From 6113e498fc2da22df466bf72ed78afb37ba10797 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Fri, 18 Sep 2015 08:23:25 +0000 Subject: [PATCH] Updates: FTP: Add a missing PCRE modifer in [34281]. See #16026, #33432x Built from https://develop.svn.wordpress.org/trunk@34282 git-svn-id: http://core.svn.wordpress.org/trunk@34246 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-ftp.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-ftp.php b/wp-admin/includes/class-ftp.php index 81272f1ed3..4f75e409f8 100644 --- a/wp-admin/includes/class-ftp.php +++ b/wp-admin/includes/class-ftp.php @@ -444,7 +444,7 @@ class ftp_base { } if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE; if(!$this->_checkCode()) return FALSE; - $mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/", "\\1", $this->_message); + $mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message); $date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d"); $timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]); return $timestamp; diff --git a/wp-includes/version.php b/wp-includes/version.php index b430748c5f..a960b96220 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34281'; +$wp_version = '4.4-alpha-34282'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.