Merge pull request #156 from djdallmann/v2.5

Added support for filenames with spaces by using escapeshellarg() to eva...
This commit is contained in:
Tobias Reich 2014-05-17 22:50:00 +02:00
commit 1cef3c29c4

View File

@ -87,8 +87,11 @@ class Import extends Module {
$out = '';
$ret = '';
$file = escapeshellarg($file);
$cmd = $osmv . " $file " . LYCHEE_DATA . $tmpdirname;
@exec($cmd, $out, $ret);
@exec($osmv . ' ' . $file . ' ' . LYCHEE_DATA . $tmpdirname, $out, $ret);
if (isset($ret)&&($ret>0)) Log::error($database, __METHOD__, __LINE__, "Failed to move directory or file ($ret):" . $file);
}