WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Filesystem: Avoid PHP warnings when using the FTP Sockets class. 

See #35026 

Built from https://develop.svn.wordpress.org/trunk@35946


git-svn-id: http://core.svn.wordpress.org/trunk@35910 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-12-15 03:12:26 +00:00
parent bda1b2ace9
commit 8db5455eea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/class-ftp.php
View File

@ -694,7 +694,7 @@ class ftp_base {
} }
foreach($list as $k=>$v) { foreach($list as $k=>$v) {
$list[$k]=$this->parselisting($v); $list[$k]=$this->parselisting($v);
if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]); if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
} }
$ret=true; $ret=true;
foreach($list as $el) { foreach($list as $el) {
@ -727,7 +727,7 @@ class ftp_base {
foreach($list as $k=>$v) { foreach($list as $k=>$v) {
$list[$k]=$this->parselisting($v); $list[$k]=$this->parselisting($v);
if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]); if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
} }
$ret=true; $ret=true;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-35944'; $wp_version = '4.5-alpha-35946';
/** /**
* 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.