Merge pull request 'RVRNEXT-31 change logic of checking external assets' (#24 ) from bugfix/RVRNEXT-31-allow-special-characters-for-local-assets into master

Reviewed-on: #24
RVRNEXT-31 change logic of checking external assets
2023-05-28 21:13:20 +02:00 · 2023-05-28 21:00:43 +02:00 · 2023-05-28 15:56:14 +02:00 · 2023-05-28 15:54:54 +02:00
2 changed files with 1 additions and 3 deletions
@@ -305,8 +305,6 @@ class PersistentDataManager implements IPersistentDataManager

            if ($relationModel !== null) {
                $model->$methodSet($relationModel->getId());
-            } else {
-                $model->$methodSet(null);
            }
        }
    }
@@ -139,7 +139,7 @@ class Linker
    {
        $output = [];

-        if (preg_match('/^[\w\/\.]+$/', $asset) === 1) {
+        if (preg_match('/^http(s)?/', $asset) !== 1) {
            if (
                empty($_ENV['DEV']) &&
                filesize(ROOT . '/public/static/' . $asset) < self::INLINE_ASSET_LIMIT
Author	SHA1	Message	Date
bence	8d490e48aa	Merge pull request 'RVRNEXT-31 change logic of checking external assets' (#24 ) from bugfix/RVRNEXT-31-allow-special-characters-for-local-assets into master soko-web/pipeline/head This commit looks good Details Reviewed-on: #24	2023-05-28 21:13:20 +02:00
bence	1dcab1abe2	RVRNEXT-31 change logic of checking external assets soko-web/pipeline/pr-master This commit looks good Details	2023-05-28 21:00:43 +02:00
bence	bda12177eb	Merge pull request 'Revert "fix the case when relation is set to null"' (#23 ) from bugfix/fix-syncrelations into master soko-web/pipeline/head This commit looks good Details Reviewed-on: #23	2023-05-28 15:56:14 +02:00
bence	f037de014e	Revert "fix the case when relation is set to null" soko-web/pipeline/pr-master This commit looks good Details This reverts commit `25548176bb`.	2023-05-28 15:54:54 +02:00