Commit 08b71aaa authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.0.0-rc.19.2'

parents 52d72268 6edbf56f
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.0.0-rc.19.1';
const VERSION = '4.0.0-rc.19.2';
/**
* Performs some startup checks
......
......@@ -221,7 +221,7 @@ class uploader {
$this->config['uploadDir'] = strlen($this->config['uploadDir'])
? path::normalize($this->config['uploadDir'])
: path::url2fullPath("/$path");
$this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
$this->typeDir = realpath("{$this->config['uploadDir']}/{$this->type}");
$this->typeURL = "{$this->config['uploadURL']}/{$this->type}";
// SITE ROOT
......@@ -229,7 +229,7 @@ class uploader {
$this->config['uploadDir'] = strlen($this->config['uploadDir'])
? path::normalize($this->config['uploadDir'])
: path::normalize($_SERVER['DOCUMENT_ROOT']);
$this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
$this->typeDir = realpath("{$this->config['uploadDir']}/{$this->type}");
$this->typeURL = "/{$this->type}";
// ABSOLUTE & RELATIVE
......@@ -240,7 +240,7 @@ class uploader {
$this->config['uploadDir'] = strlen($this->config['uploadDir'])
? path::normalize($this->config['uploadDir'])
: path::url2fullPath($this->config['uploadURL']);
$this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
$this->typeDir = realpath("{$this->config['uploadDir']}/{$this->type}");
$this->typeURL = "{$this->config['uploadURL']}/{$this->type}";
}
......@@ -302,7 +302,7 @@ class uploader {
}
// CHECK & CREATE UPLOAD FOLDER
if (!is_dir($this->typeDir)) {
if (!is_dir($this->typeDir) && !is_link($this->typeDir)) {
if (!mkdir($this->typeDir, $this->config['dirPerms']))
$this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
} elseif (!is_readable($this->typeDir))
......
This diff is collapsed.
{
"name": "acp3-cms",
"version": "4.0.0-rc.19.1",
"version": "4.0.0-rc.19.2",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment