Merge branch '2.0'

* 2.0:
  SFTP: don't update stat cache when it's been disabled
This commit is contained in:
Andreas Fischer 2015-07-06 23:48:28 +02:00
commit cae4a3ebbb

View File

@ -1023,6 +1023,10 @@ class SFTP extends SSH2
*/ */
function _update_stat_cache($path, $value) function _update_stat_cache($path, $value)
{ {
if ($this->use_stat_cache === false) {
return;
}
// preg_replace('#^/|/(?=/)|/$#', '', $dir) == str_replace('//', '/', trim($path, '/')) // preg_replace('#^/|/(?=/)|/$#', '', $dir) == str_replace('//', '/', trim($path, '/'))
$dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path)); $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));