updated elysia_cron, elfinder, metatag, libraries, email_registration, migrate, nodeform_cols
This commit is contained in:
@@ -40,15 +40,16 @@ class elFinderVolumeDrupal extends elFinderVolumeLocalFileSystem {
|
||||
$pvtpath = drupal_realpath('private://');
|
||||
$pubpath = drupal_realpath('public://');
|
||||
$tmppath = drupal_realpath('temporary://');
|
||||
$final_path = DIRECTORY_SEPARATOR !== '/' ? str_replace(DIRECTORY_SEPARATOR, '/', $path) : $path;
|
||||
|
||||
$uri = '';
|
||||
|
||||
if (strpos($path, $pvtpath) === 0) {
|
||||
$uri = 'private://' . substr($path, strlen($pvtpath) + 1);
|
||||
} elseif (strpos($path, $tmppath) === 0) {
|
||||
$uri = 'temporary://' . substr($path, strlen($tmppath) + 1);
|
||||
if (strpos($final_path, $pvtpath) === 0) {
|
||||
$uri = 'private://' . substr($final_path, strlen($pvtpath) + 1);
|
||||
} elseif (strpos($final_path, $tmppath) === 0) {
|
||||
$uri = 'temporary://' . substr($final_path, strlen($tmppath) + 1);
|
||||
} else {
|
||||
$uri = 'public://' . substr($path, strlen($pubpath) + 1);
|
||||
$uri = 'public://' . substr($final_path, strlen($pubpath) + 1);
|
||||
}
|
||||
|
||||
return @file_stream_wrapper_uri_normalize($uri);
|
||||
@@ -357,7 +358,8 @@ class elFinderVolumeDrupal extends elFinderVolumeLocalFileSystem {
|
||||
$this->setError(strip_tags(implode(' ', $validation_errors)));
|
||||
return FALSE;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
watchdog('elfinder', 'File upload "' . $name . '" not found in $_FILES');
|
||||
}
|
||||
return TRUE;
|
||||
@@ -405,6 +407,12 @@ class elFinderVolumeDrupal extends elFinderVolumeLocalFileSystem {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
public static function stat_corrector(&$stat, $path, $statOwner, $volumeDriveInstance) {
|
||||
if (method_exists($volumeDriveInstance, 'owner')) {
|
||||
$stat['owner'] = $volumeDriveInstance->owner($volumeDriveInstance->encode($path));
|
||||
}
|
||||
}
|
||||
|
||||
public function desc($target, $newdesc = NULL) {
|
||||
$path = $this->decode($target);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user