From 8db5455eead3b561e48dbd47c12766d169ecb014 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Tue, 15 Dec 2015 03:12:26 +0000
Subject: [PATCH] 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
---
 wp-admin/includes/class-ftp.php | 4 ++--
 wp-includes/version.php         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/class-ftp.php b/wp-admin/includes/class-ftp.php
index 4f75e409f8..de6a29966a 100644
--- a/wp-admin/includes/class-ftp.php
+++ b/wp-admin/includes/class-ftp.php
@@ -694,7 +694,7 @@ class ftp_base {
 		}
 		foreach($list as $k=>$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;
 		foreach($list as $el) {
@@ -727,7 +727,7 @@ class ftp_base {
 
 		foreach($list as $k=>$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;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 31864e9516..c6bb324683 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.