From 3c0416ac4415c05621d0e299d2b8c019d47b5c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Wyss?= Date: Tue, 13 Nov 2018 16:02:37 +0100 Subject: [PATCH 1/2] #584 - PHP deprecated warning --- lib/functions/filedir/function.makeCorrectDir.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/functions/filedir/function.makeCorrectDir.php b/lib/functions/filedir/function.makeCorrectDir.php index dcc91ca2..4dd3c3d4 100644 --- a/lib/functions/filedir/function.makeCorrectDir.php +++ b/lib/functions/filedir/function.makeCorrectDir.php @@ -27,9 +27,9 @@ function makeCorrectDir($dir) { 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 { - 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); From 03f62365b146dfbf1f218f66d2932d53f522d068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Wyss?= Date: Tue, 13 Nov 2018 17:29:39 +0100 Subject: [PATCH 2/2] #584 - Revert change for PHP <=5.4.6 --- lib/functions/filedir/function.makeCorrectDir.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/filedir/function.makeCorrectDir.php b/lib/functions/filedir/function.makeCorrectDir.php index 4dd3c3d4..d0722812 100644 --- a/lib/functions/filedir/function.makeCorrectDir.php +++ b/lib/functions/filedir/function.makeCorrectDir.php @@ -27,7 +27,7 @@ function makeCorrectDir($dir) { 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 { assert((is_string($dir) && strlen($dir) > 0), 'Value "' . $dir .'" does not look like an actual folder name'); }