Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix rebase issue

Browse source
This commit is contained in:
ArthurHoaro 2020-10-27 19:55:29 +01:00
parent 36e6d88dbf
commit 54afb1d6f6
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/front/controller/admin/ServerController.php
View file

@ -4,8 +4,8 @@
namespace Shaarli\Front\Controller\Admin; namespace Shaarli\Front\Controller\Admin;
use Shaarli\ApplicationUtils; use Shaarli\Helper\ApplicationUtils;
use Shaarli\FileUtils; use Shaarli\Helper\FileUtils;
use Slim\Http\Request; use Slim\Http\Request;
use Slim\Http\Response; use Slim\Http\Response;

2
application/helper/FileUtils.php
View file

@ -133,7 +133,7 @@ public static function clearFolder(string $path, bool $selfDelete, array $exclud
*/ */
public static function isPathInShaarliFolder(string $path): bool public static function isPathInShaarliFolder(string $path): bool
{ {
$rootDirectory = dirname(dirname(__FILE__)); $rootDirectory = dirname(dirname(dirname(__FILE__)));
return strpos(realpath($path), $rootDirectory) !== false; return strpos(realpath($path), $rootDirectory) !== false;
} }

1
tests/helper/FileUtilsTest.php
View file

@ -4,6 +4,7 @@
use Exception; use Exception;
use Shaarli\Exceptions\IOException; use Shaarli\Exceptions\IOException;
use Shaarli\TestCase;
/** /**
* Class FileUtilsTest * Class FileUtilsTest