Fix rebase issue
This commit is contained in:
parent
36e6d88dbf
commit
54afb1d6f6
3 changed files with 4 additions and 3 deletions
|
@ -4,8 +4,8 @@
|
|||
|
||||
namespace Shaarli\Front\Controller\Admin;
|
||||
|
||||
use Shaarli\ApplicationUtils;
|
||||
use Shaarli\FileUtils;
|
||||
use Shaarli\Helper\ApplicationUtils;
|
||||
use Shaarli\Helper\FileUtils;
|
||||
use Slim\Http\Request;
|
||||
use Slim\Http\Response;
|
||||
|
||||
|
|
|
@ -133,7 +133,7 @@ public static function clearFolder(string $path, bool $selfDelete, array $exclud
|
|||
*/
|
||||
public static function isPathInShaarliFolder(string $path): bool
|
||||
{
|
||||
$rootDirectory = dirname(dirname(__FILE__));
|
||||
$rootDirectory = dirname(dirname(dirname(__FILE__)));
|
||||
|
||||
return strpos(realpath($path), $rootDirectory) !== false;
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
use Exception;
|
||||
use Shaarli\Exceptions\IOException;
|
||||
use Shaarli\TestCase;
|
||||
|
||||
/**
|
||||
* Class FileUtilsTest
|
||||
|
|
Loading…
Reference in a new issue