Merge branch '0.9.x' of github.com:Froxlor/Froxlor into 0.9.x
This commit is contained in:
@@ -29,7 +29,7 @@ function makeCorrectDir($dir) {
|
|||||||
if (version_compare("5.4.6", PHP_VERSION, ">")) {
|
if (version_compare("5.4.6", PHP_VERSION, ">")) {
|
||||||
assert('is_string($dir) && strlen($dir) > 0 /* $dir does not look like an actual folder name */');
|
assert('is_string($dir) && strlen($dir) > 0 /* $dir does not look like an actual folder name */');
|
||||||
} else {
|
} else {
|
||||||
assert('is_string($dir) && strlen($dir) > 0', 'Value "' . $dir .'" does not look like an actual folder name');
|
assert((is_string($dir) && strlen($dir) > 0), 'Value "' . $dir .'" does not look like an actual folder name');
|
||||||
}
|
}
|
||||||
|
|
||||||
$dir = trim($dir);
|
$dir = trim($dir);
|
||||||
|
|||||||
Reference in New Issue
Block a user