Skip to content

Commit

Permalink
Merge pull request Studio-42#745 from Illirgway/patch-2
Browse files Browse the repository at this point in the history
Update elFinderVolumeDriver.class.php
  • Loading branch information
nao-pon committed Apr 26, 2014
2 parents 3d4bcfa + be0cc9a commit 8be000d
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions php/elFinderVolumeDriver.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -3193,19 +3193,20 @@ protected function stripos($haystack , $needle , $offset = 0) {
* @return array
*/
protected function getArchivers($use_cache = true) {

$arcs = array(
'create' => array(),
'extract' => array()
);

if (!function_exists('proc_open')) {
return array();
return $arcs;
}

if ($use_cache && isset($_SESSION['ELFINDER_ARCHIVERS_CACHE']) && is_array($_SESSION['ELFINDER_ARCHIVERS_CACHE'])) {
return $_SESSION['ELFINDER_ARCHIVERS_CACHE'];
}

$arcs = array(
'create' => array(),
'extract' => array()
);

$this->procExec('tar --version', $o, $ctar);

if ($ctar == 0) {
Expand Down

0 comments on commit 8be000d

Please sign in to comment.