Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

47254 Files are not loaded on property detail page #800

Merged
merged 6 commits into from
Jul 26, 2024
Merged

47254 Files are not loaded on property detail page #800

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab37615
47254 load script for unit detail
dai-eastgate Apr 19, 2024
5825191
Merge branch 'master' into 47254-files-are-not-loaded-on-property-det…
dai-eastgate May 29, 2024
e09729a
Merge branch 'master' into 47254-files-are-not-loaded-on-property-det…
dai-eastgate Jun 17, 2024
11ac4e0
Merge branch 'master' into 47254-files-are-not-loaded-on-property-det…
dai-eastgate Jun 19, 2024
bbc677a
Merge branch 'master' into 47254-files-are-not-loaded-on-property-det…
dai-eastgate Jun 19, 2024
605f29d
Merge branch 'master' into 47254-files-are-not-loaded-on-property-det…
dai-eastgate Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,10 @@ private function getShortcodeByPostMeta(): array
*/
private function isEstateListPage(string $content): bool
{
return $this->matchesShortcode($content, self::ESTATE_TAG, 'view', '[^"]*') &&
!$this->matchesShortcode($content, self::ESTATE_TAG, 'view', 'detail') ||
$this->matchesShortcode($content, self::ESTATE_TAG, 'units', '[^"]*');
return ($this->matchesShortcode($content, self::ESTATE_TAG, 'view', '[^"]*') &&
!$this->matchesShortcode($content, self::ESTATE_TAG, 'view', 'detail')) ||
($this->matchesShortcode($content, self::ESTATE_TAG, 'units', '[^"]*') &&
!$this->matchesShortcode($content, self::ESTATE_TAG, 'view', 'detail'));
}

/**
Expand Down Expand Up @@ -184,7 +185,7 @@ private function isFormPage(string $content): bool
*/
private function matchesShortcode(string $content, string $tag, string $attribute, string $valuePattern): bool
{
$pattern = '/\[' . $tag . '\s+' . $attribute . '="' . $valuePattern . '"\]/';
$pattern = '/\[' . $tag . '\s+.*?' . $attribute . '="' . $valuePattern . '".*?\]/';
return (bool) preg_match($pattern, $content);
}

Expand Down
Loading