Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 11:37:12 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into feature/media

Browse Source
This commit is contained in:
Djamil Legato
2022-03-03 11:41:22 -08:00
parent 0d7d39665f b80fcca0cf
commit 269d023987
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system/src/Grav/Common/Utils.php
View File

@@ -134,11 +134,11 @@ abstract class Utils
$resource = $locator->findResource($input, false);
}
} else {
$root = $uri->rootUrl() . '/';
if (static::startsWith($input, $root)) {
$input = static::replaceFirstOccurrence($root, '/', $input);
}
// $root = $uri->rootUrl();
// $pattern = '/(' . '\\' . $root . '[\s\/])/';
// if (preg_match($pattern, $input, $matches)) {
// $input = static::replaceFirstOccurrence($matches[0], '', $input);
// }
$input = ltrim($input, '/');

24
tests/unit/Grav/Common/UtilsTest.php
View File

@@ -502,19 +502,19 @@ class UtilsTest extends \Codeception\TestCase\Test
self::assertSame('http://testing.dev/subdir/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg', true));
self::assertSame('http://testing.dev/subdir/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg', true));
// Paths including the grav base.
self::assertSame('/subdir/', Utils::url('/subdir'));
self::assertSame('/subdir/path1', Utils::url('/subdir/path1'));
self::assertSame('/subdir/path1/path2', Utils::url('/subdir/path1/path2'));
self::assertSame('/subdir/foobar.jpg', Utils::url('/subdir/foobar.jpg'));
self::assertSame('/subdir/path1/foobar.jpg', Utils::url('/subdir/path1/foobar.jpg'));
// Absolute Paths including the grav base.
self::assertSame('/subdir/subdir', Utils::url('/subdir'));
self::assertSame('/subdir/subdir/path1', Utils::url('/subdir/path1'));
self::assertSame('/subdir/subdir/path1/path2', Utils::url('/subdir/path1/path2'));
self::assertSame('/subdir/subdir/foobar.jpg', Utils::url('/subdir/foobar.jpg'));
self::assertSame('/subdir/subdir/path1/foobar.jpg', Utils::url('/subdir/path1/foobar.jpg'));
// Relative paths from Grav root with domain.
self::assertSame('http://testing.dev/subdir/', Utils::url('/subdir', true));
self::assertSame('http://testing.dev/subdir/path1', Utils::url('/subdir/path1', true));
self::assertSame('http://testing.dev/subdir/path1/path2', Utils::url('/subdir/path1/path2', true));
self::assertSame('http://testing.dev/subdir/foobar.jpg', Utils::url('/subdir/foobar.jpg', true));
self::assertSame('http://testing.dev/subdir/path1/foobar.jpg', Utils::url('/subdir/path1/foobar.jpg', true));
// Absolute paths from Grav root with domain.
self::assertSame('http://testing.dev/subdir/subdir', Utils::url('/subdir', true));
self::assertSame('http://testing.dev/subdir/subdir/path1', Utils::url('/subdir/path1', true));
self::assertSame('http://testing.dev/subdir/subdir/path1/path2', Utils::url('/subdir/path1/path2', true));
self::assertSame('http://testing.dev/subdir/subdir/foobar.jpg', Utils::url('/subdir/foobar.jpg', true));
self::assertSame('http://testing.dev/subdir/subdir/path1/foobar.jpg', Utils::url('/subdir/path1/foobar.jpg', true));
// Relative paths from Grav root.
self::assertSame('/subdir/subdir', Utils::url('subdir'));