Merge branch 'master' into php5

* master:
  SFTP: Use the correct stat cache property: stat_cache
This commit is contained in:
Andreas Fischer 2014-05-22 15:27:56 +02:00
commit 518eb861e9

View File

@ -942,7 +942,7 @@ class Net_SFTP extends Net_SSH2
// preg_replace('#^/|/(?=/)|/$#', '', $dir) == str_replace('//', '/', trim($path, '/')) // preg_replace('#^/|/(?=/)|/$#', '', $dir) == str_replace('//', '/', trim($path, '/'))
$dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path)); $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
$temp = &$this->cache; $temp = &$this->stat_cache;
foreach ($dirs as $dir) { foreach ($dirs as $dir) {
if (!isset($temp[$dir])) { if (!isset($temp[$dir])) {
$temp[$dir] = array(); $temp[$dir] = array();
@ -965,7 +965,7 @@ class Net_SFTP extends Net_SSH2
{ {
$dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path)); $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
$temp = &$this->cache; $temp = &$this->stat_cache;
foreach ($dirs as $dir) { foreach ($dirs as $dir) {
if ($dir == end($dirs)) { if ($dir == end($dirs)) {
unset($temp[$dir]); unset($temp[$dir]);
@ -991,7 +991,7 @@ class Net_SFTP extends Net_SSH2
{ {
$dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path)); $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
$temp = &$this->cache; $temp = &$this->stat_cache;
foreach ($dirs as $dir) { foreach ($dirs as $dir) {
if (!isset($temp[$dir])) { if (!isset($temp[$dir])) {
return false; return false;