nystudio107 /
craft-seomatic
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function add($metaItem, string $handle = self::GENERAL_HANDLE) |
| 67 | 67 | { |
| 68 | - $key = MetaTitleContainer::CONTAINER_TYPE . $handle; |
|
| 68 | + $key = MetaTitleContainer::CONTAINER_TYPE.$handle; |
|
| 69 | 69 | Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key); |
| 70 | 70 | |
| 71 | 71 | /** @var MetaTitle $metaItem */ |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | public function container(string $handle = self::GENERAL_HANDLE) |
| 91 | 91 | { |
| 92 | - $key = MetaTitleContainer::CONTAINER_TYPE . $handle; |
|
| 92 | + $key = MetaTitleContainer::CONTAINER_TYPE.$handle; |
|
| 93 | 93 | |
| 94 | 94 | return Seomatic::$plugin->metaContainers->getMetaContainer($key); |
| 95 | 95 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function add($metaItem, string $handle = self::GENERAL_HANDLE) |
| 78 | 78 | { |
| 79 | - $key = MetaTagContainer::CONTAINER_TYPE . $handle; |
|
| 79 | + $key = MetaTagContainer::CONTAINER_TYPE.$handle; |
|
| 80 | 80 | Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key); |
| 81 | 81 | |
| 82 | 82 | /** @var MetaTag $metaItem */ |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | public function container(string $handle = self::GENERAL_HANDLE) |
| 102 | 102 | { |
| 103 | - $key = MetaTagContainer::CONTAINER_TYPE . $handle; |
|
| 103 | + $key = MetaTagContainer::CONTAINER_TYPE.$handle; |
|
| 104 | 104 | |
| 105 | 105 | return Seomatic::$plugin->metaContainers->getMetaContainer($key); |
| 106 | 106 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function add($metaItem, string $handle = self::GENERAL_HANDLE) |
| 67 | 67 | { |
| 68 | - $key = MetaScriptContainer::CONTAINER_TYPE . $handle; |
|
| 68 | + $key = MetaScriptContainer::CONTAINER_TYPE.$handle; |
|
| 69 | 69 | Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key); |
| 70 | 70 | |
| 71 | 71 | /** @var MetaScript $metaItem */ |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | public function container(string $handle = self::GENERAL_HANDLE) |
| 91 | 91 | { |
| 92 | - $key = MetaScriptContainer::CONTAINER_TYPE . $handle; |
|
| 92 | + $key = MetaScriptContainer::CONTAINER_TYPE.$handle; |
|
| 93 | 93 | |
| 94 | 94 | return Seomatic::$plugin->metaContainers->getMetaContainer($key); |
| 95 | 95 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | public function add($metaItem, string $handle = self::GENERAL_HANDLE): MetaJsonLd |
| 74 | 74 | { |
| 75 | - $key = MetaJsonLdContainer::CONTAINER_TYPE . $handle; |
|
| 75 | + $key = MetaJsonLdContainer::CONTAINER_TYPE.$handle; |
|
| 76 | 76 | Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key); |
| 77 | 77 | |
| 78 | 78 | /** @var MetaJsonLd $metaItem */ |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public function container(string $handle = self::GENERAL_HANDLE) |
| 98 | 98 | { |
| 99 | - $key = MetaJsonLdContainer::CONTAINER_TYPE . $handle; |
|
| 99 | + $key = MetaJsonLdContainer::CONTAINER_TYPE.$handle; |
|
| 100 | 100 | |
| 101 | 101 | return Seomatic::$plugin->metaContainers->getMetaContainer($key); |
| 102 | 102 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | public function add($metaItem, string $handle = self::GENERAL_HANDLE) |
| 77 | 77 | { |
| 78 | - $key = MetaLinkContainer::CONTAINER_TYPE . $handle; |
|
| 78 | + $key = MetaLinkContainer::CONTAINER_TYPE.$handle; |
|
| 79 | 79 | Seomatic::$plugin->metaContainers->addToMetaContainer($metaItem, $key); |
| 80 | 80 | |
| 81 | 81 | /** @var MetaLink $metaItem */ |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | */ |
| 100 | 100 | public function container(string $handle = self::GENERAL_HANDLE) |
| 101 | 101 | { |
| 102 | - $key = MetaLinkContainer::CONTAINER_TYPE . $handle; |
|
| 102 | + $key = MetaLinkContainer::CONTAINER_TYPE.$handle; |
|
| 103 | 103 | |
| 104 | 104 | return Seomatic::$plugin->metaContainers->getMetaContainer($key); |
| 105 | 105 | } |
@@ -148,9 +148,9 @@ discard block |
||
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | $cache = Craft::$app->getCache(); |
| 151 | - $uniqueKey = $groupId . $type . $handle . $siteId; |
|
| 152 | - $cacheKey = self::CACHE_KEY . $uniqueKey; |
|
| 153 | - $queueJobCacheKey = self::QUEUE_JOB_CACHE_KEY . $uniqueKey; |
|
| 151 | + $uniqueKey = $groupId.$type.$handle.$siteId; |
|
| 152 | + $cacheKey = self::CACHE_KEY.$uniqueKey; |
|
| 153 | + $queueJobCacheKey = self::QUEUE_JOB_CACHE_KEY.$uniqueKey; |
|
| 154 | 154 | $result = $cache->get($cacheKey); |
| 155 | 155 | // If the sitemap isn't cached, start a job to create it |
| 156 | 156 | // Even if it is cached, if $throwException === false we should regenerate it, as it is part of |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | $dependency = new TagDependency([ |
| 190 | 190 | 'tags' => [ |
| 191 | 191 | self::GLOBAL_SITEMAP_CACHE_TAG, |
| 192 | - self::CACHE_KEY . $uniqueKey, |
|
| 192 | + self::CACHE_KEY.$uniqueKey, |
|
| 193 | 193 | ], |
| 194 | 194 | ]); |
| 195 | 195 | $cache->set($queueJobCacheKey, $jobId, $cacheDuration, $dependency); |
@@ -221,11 +221,11 @@ discard block |
||
| 221 | 221 | // Return an empty XML document |
| 222 | 222 | $lines[] = '<?xml version="1.0" encoding="UTF-8"?>'; |
| 223 | 223 | $lines[] = '<?xml-stylesheet type="text/xsl" href="sitemap-empty.xsl"?>'; |
| 224 | - $lines[] = '<!-- ' . Craft::t('seomatic', 'This sitemap has not been generated yet.') . ' -->'; |
|
| 225 | - $lines[] = '<!-- ' . Craft::t('seomatic', 'If you are seeing this in local dev or an') . ' -->'; |
|
| 226 | - $lines[] = '<!-- ' . Craft::t('seomatic', 'environment with `devMode` on, caches only') . ' -->'; |
|
| 227 | - $lines[] = '<!-- ' . Craft::t('seomatic', 'last for 30 seconds in local dev, so it is') . ' -->'; |
|
| 228 | - $lines[] = '<!-- ' . Craft::t('seomatic', 'normal for the sitemap to not be cached.') . ' -->'; |
|
| 224 | + $lines[] = '<!-- '.Craft::t('seomatic', 'This sitemap has not been generated yet.').' -->'; |
|
| 225 | + $lines[] = '<!-- '.Craft::t('seomatic', 'If you are seeing this in local dev or an').' -->'; |
|
| 226 | + $lines[] = '<!-- '.Craft::t('seomatic', 'environment with `devMode` on, caches only').' -->'; |
|
| 227 | + $lines[] = '<!-- '.Craft::t('seomatic', 'last for 30 seconds in local dev, so it is').' -->'; |
|
| 228 | + $lines[] = '<!-- '.Craft::t('seomatic', 'normal for the sitemap to not be cached.').' -->'; |
|
| 229 | 229 | $lines[] = '<urlset>'; |
| 230 | 230 | $lines[] = '</urlset>'; |
| 231 | 231 | } |
@@ -246,9 +246,9 @@ discard block |
||
| 246 | 246 | public function invalidateCache(string $handle, int $siteId) |
| 247 | 247 | { |
| 248 | 248 | $cache = Craft::$app->getCache(); |
| 249 | - TagDependency::invalidate($cache, self::SITEMAP_CACHE_TAG . $handle . $siteId); |
|
| 249 | + TagDependency::invalidate($cache, self::SITEMAP_CACHE_TAG.$handle.$siteId); |
|
| 250 | 250 | Craft::info( |
| 251 | - 'Sitemap cache cleared: ' . $handle, |
|
| 251 | + 'Sitemap cache cleared: '.$handle, |
|
| 252 | 252 | __METHOD__ |
| 253 | 253 | ); |
| 254 | 254 | } |
@@ -100,7 +100,7 @@ |
||
| 100 | 100 | // Craft adds the `tokenParam` URL param back in via UrlHelper, strip it again |
| 101 | 101 | if (Seomatic::$plugin->metaContainers->paginationPage === '1') { |
| 102 | 102 | $token = Craft::$app->getConfig()->getGeneral()->tokenParam; |
| 103 | - $url = preg_replace('~([?&])' . $token . '=[^&]*~', '$1', $url); |
|
| 103 | + $url = preg_replace('~([?&])'.$token.'=[^&]*~', '$1', $url); |
|
| 104 | 104 | $url = rtrim($url, '?&'); |
| 105 | 105 | $url = str_replace(['&&', '?&'], ['&', '?'], $url); |
| 106 | 106 | $data['href'] = $url; |
@@ -265,7 +265,7 @@ |
||
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | if (empty($html) && !empty($this->templatePath)) { |
| 268 | - $html = '/* ' . $this->name . Craft::t('seomatic', ' script did not render') . ' */' . PHP_EOL; |
|
| 268 | + $html = '/* '.$this->name.Craft::t('seomatic', ' script did not render').' */'.PHP_EOL; |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | return $html; |
@@ -65,19 +65,19 @@ discard block |
||
| 65 | 65 | } |
| 66 | 66 | foreach (self::PULL_TEXT_FIELDS as $fields) { |
| 67 | 67 | $fieldName = $fields['fieldName']; |
| 68 | - $source = $bundleSettings[$fieldName . 'Source'] ?? ''; |
|
| 69 | - $sourceField = $bundleSettings[$fieldName . 'Field'] ?? ''; |
|
| 68 | + $source = $bundleSettings[$fieldName.'Source'] ?? ''; |
|
| 69 | + $sourceField = $bundleSettings[$fieldName.'Field'] ?? ''; |
|
| 70 | 70 | if (!empty($source)) { |
| 71 | 71 | $seoField = $fields['seoField']; |
| 72 | 72 | switch ($source) { |
| 73 | 73 | case 'sameAsSeo': |
| 74 | 74 | $globalsSettings[$fieldName] = |
| 75 | - '{{ seomatic.meta.' . $seoField . ' }}'; |
|
| 75 | + '{{ seomatic.meta.'.$seoField.' }}'; |
|
| 76 | 76 | break; |
| 77 | 77 | |
| 78 | 78 | case 'sameAsSiteTwitter': |
| 79 | 79 | $globalsSettings[$fieldName] = |
| 80 | - '{{ seomatic.site.' . $seoField . ' }}'; |
|
| 80 | + '{{ seomatic.site.'.$seoField.' }}'; |
|
| 81 | 81 | break; |
| 82 | 82 | |
| 83 | 83 | case 'sameAsGlobal': |
@@ -88,28 +88,28 @@ discard block |
||
| 88 | 88 | case 'fromField': |
| 89 | 89 | $globalsSettings[$fieldName] = |
| 90 | 90 | '{{ seomatic.helper.extractTextFromField(' |
| 91 | - . $objectPrefix . $elementName . $sourceField |
|
| 91 | + . $objectPrefix.$elementName.$sourceField |
|
| 92 | 92 | . ') }}'; |
| 93 | 93 | break; |
| 94 | 94 | |
| 95 | 95 | case 'fromUserField': |
| 96 | 96 | $globalsSettings[$fieldName] = |
| 97 | 97 | '{{ seomatic.helper.extractTextFromField(' |
| 98 | - . $objectPrefix . $elementName . 'author.' . $sourceField |
|
| 98 | + . $objectPrefix.$elementName.'author.'.$sourceField |
|
| 99 | 99 | . ') }}'; |
| 100 | 100 | break; |
| 101 | 101 | |
| 102 | 102 | case 'summaryFromField': |
| 103 | 103 | $globalsSettings[$fieldName] = |
| 104 | 104 | '{{ seomatic.helper.extractSummary(seomatic.helper.extractTextFromField(' |
| 105 | - . $objectPrefix . $elementName . $sourceField |
|
| 105 | + . $objectPrefix.$elementName.$sourceField |
|
| 106 | 106 | . ')) }}'; |
| 107 | 107 | break; |
| 108 | 108 | |
| 109 | 109 | case 'keywordsFromField': |
| 110 | 110 | $globalsSettings[$fieldName] = |
| 111 | 111 | '{{ seomatic.helper.extractKeywords(seomatic.helper.extractTextFromField(' |
| 112 | - . $objectPrefix . $elementName . $sourceField |
|
| 112 | + . $objectPrefix.$elementName.$sourceField |
|
| 113 | 113 | . ')) }}'; |
| 114 | 114 | break; |
| 115 | 115 | |
@@ -140,25 +140,25 @@ discard block |
||
| 140 | 140 | } |
| 141 | 141 | foreach (self::PULL_ASSET_FIELDS as $fields) { |
| 142 | 142 | $fieldName = $fields['fieldName']; |
| 143 | - $fieldNameWidth = $fields['fieldName'] . 'Width'; |
|
| 144 | - $fieldNameHeight = $fields['fieldName'] . 'Height'; |
|
| 145 | - $source = $bundleSettings[$fieldName . 'Source'] ?? ''; |
|
| 146 | - $ids = $bundleSettings[$fieldName . 'Ids'] ?? []; |
|
| 147 | - $sourceField = $bundleSettings[$fieldName . 'Field'] ?? ''; |
|
| 143 | + $fieldNameWidth = $fields['fieldName'].'Width'; |
|
| 144 | + $fieldNameHeight = $fields['fieldName'].'Height'; |
|
| 145 | + $source = $bundleSettings[$fieldName.'Source'] ?? ''; |
|
| 146 | + $ids = $bundleSettings[$fieldName.'Ids'] ?? []; |
|
| 147 | + $sourceField = $bundleSettings[$fieldName.'Field'] ?? ''; |
|
| 148 | 148 | if (!empty($source)) { |
| 149 | - $transformImage = $bundleSettings[$fieldName . 'Transform'] ?? true; |
|
| 149 | + $transformImage = $bundleSettings[$fieldName.'Transform'] ?? true; |
|
| 150 | 150 | $seoField = $fields['seoField']; |
| 151 | 151 | $tranformModeField = $fields['transformModeField']; |
| 152 | 152 | $transformMode = $bundleSettings[$tranformModeField] ?? 'crop'; |
| 153 | 153 | if (empty($transformMode)) { |
| 154 | 154 | $transformMode = 'crop'; |
| 155 | 155 | } |
| 156 | - $seoFieldWidth = $fields['seoField'] . 'Width'; |
|
| 157 | - $seoFieldHeight = $fields['seoField'] . 'Height'; |
|
| 156 | + $seoFieldWidth = $fields['seoField'].'Width'; |
|
| 157 | + $seoFieldHeight = $fields['seoField'].'Height'; |
|
| 158 | 158 | $transformName = $fields['transformName'] ?? 'base'; |
| 159 | 159 | // Quote all the things here for clarity |
| 160 | - $transformName = '"' . $transformName . '"'; |
|
| 161 | - $transformMode = '"' . $transformMode . '"'; |
|
| 160 | + $transformName = '"'.$transformName.'"'; |
|
| 161 | + $transformMode = '"'.$transformMode.'"'; |
|
| 162 | 162 | // Special-case Twitter transforms |
| 163 | 163 | if ($fieldName === 'twitterImage') { |
| 164 | 164 | $transformName = 'seomatic.helper.twitterTransform()'; |
@@ -173,30 +173,30 @@ discard block |
||
| 173 | 173 | if ($transformImage) { |
| 174 | 174 | switch ($source) { |
| 175 | 175 | case 'sameAsSeo': |
| 176 | - $seoSource = $bundleSettings[$seoField . 'Source'] ?? ''; |
|
| 177 | - $seoIds = $bundleSettings[$seoField . 'Ids'] ?? []; |
|
| 178 | - $seoSourceField = $bundleSettings[$seoField . 'Field'] ?? ''; |
|
| 176 | + $seoSource = $bundleSettings[$seoField.'Source'] ?? ''; |
|
| 177 | + $seoIds = $bundleSettings[$seoField.'Ids'] ?? []; |
|
| 178 | + $seoSourceField = $bundleSettings[$seoField.'Field'] ?? ''; |
|
| 179 | 179 | if (!empty($seoSource)) { |
| 180 | 180 | switch ($seoSource) { |
| 181 | 181 | case 'fromField': |
| 182 | 182 | if (!empty($seoSourceField)) { |
| 183 | 183 | $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform(' |
| 184 | - . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]' |
|
| 185 | - . ', ' . $transformName |
|
| 186 | - . ', ' . $siteId |
|
| 187 | - . ', ' . $transformMode |
|
| 184 | + . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]' |
|
| 185 | + . ', '.$transformName |
|
| 186 | + . ', '.$siteId |
|
| 187 | + . ', '.$transformMode |
|
| 188 | 188 | . ') }}'; |
| 189 | 189 | $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth(' |
| 190 | - . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]' |
|
| 191 | - . ', ' . $transformName |
|
| 192 | - . ', ' . $siteId |
|
| 193 | - . ', ' . $transformMode |
|
| 190 | + . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]' |
|
| 191 | + . ', '.$transformName |
|
| 192 | + . ', '.$siteId |
|
| 193 | + . ', '.$transformMode |
|
| 194 | 194 | . ') }}'; |
| 195 | 195 | $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight(' |
| 196 | - . $objectPrefix . $elementName . $seoSourceField . '.collect()[0]' |
|
| 197 | - . ', ' . $transformName |
|
| 198 | - . ', ' . $siteId |
|
| 199 | - . ', ' . $transformMode |
|
| 196 | + . $objectPrefix.$elementName.$seoSourceField.'.collect()[0]' |
|
| 197 | + . ', '.$transformName |
|
| 198 | + . ', '.$siteId |
|
| 199 | + . ', '.$transformMode |
|
| 200 | 200 | . ') }}'; |
| 201 | 201 | } |
| 202 | 202 | break; |
@@ -204,28 +204,28 @@ discard block |
||
| 204 | 204 | if (!empty($seoIds)) { |
| 205 | 205 | $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform(' |
| 206 | 206 | . $seoIds[0] |
| 207 | - . ', ' . $transformName |
|
| 208 | - . ', ' . $siteId |
|
| 209 | - . ', ' . $transformMode |
|
| 207 | + . ', '.$transformName |
|
| 208 | + . ', '.$siteId |
|
| 209 | + . ', '.$transformMode |
|
| 210 | 210 | . ') }}'; |
| 211 | 211 | $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth(' |
| 212 | 212 | . $seoIds[0] |
| 213 | - . ', ' . $transformName |
|
| 214 | - . ', ' . $siteId |
|
| 215 | - . ', ' . $transformMode |
|
| 213 | + . ', '.$transformName |
|
| 214 | + . ', '.$siteId |
|
| 215 | + . ', '.$transformMode |
|
| 216 | 216 | . ') }}'; |
| 217 | 217 | $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight(' |
| 218 | 218 | . $seoIds[0] |
| 219 | - . ', ' . $transformName |
|
| 220 | - . ', ' . $siteId |
|
| 221 | - . ', ' . $transformMode |
|
| 219 | + . ', '.$transformName |
|
| 220 | + . ', '.$siteId |
|
| 221 | + . ', '.$transformMode |
|
| 222 | 222 | . ') }}'; |
| 223 | 223 | } |
| 224 | 224 | break; |
| 225 | 225 | default: |
| 226 | - $globalsSettings[$fieldName] = '{{ seomatic.meta.' . $seoField . ' }}'; |
|
| 227 | - $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.' . $seoFieldWidth . ' }}'; |
|
| 228 | - $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.' . $seoFieldHeight . ' }}'; |
|
| 226 | + $globalsSettings[$fieldName] = '{{ seomatic.meta.'.$seoField.' }}'; |
|
| 227 | + $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.'.$seoFieldWidth.' }}'; |
|
| 228 | + $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.'.$seoFieldHeight.' }}'; |
|
| 229 | 229 | break; |
| 230 | 230 | } |
| 231 | 231 | } |
@@ -233,22 +233,22 @@ discard block |
||
| 233 | 233 | case 'fromField': |
| 234 | 234 | if (!empty($sourceField)) { |
| 235 | 235 | $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform(' |
| 236 | - . $objectPrefix . $elementName . $sourceField . '.collect()[0]' |
|
| 237 | - . ', ' . $transformName |
|
| 238 | - . ', ' . $siteId |
|
| 239 | - . ', ' . $transformMode |
|
| 236 | + . $objectPrefix.$elementName.$sourceField.'.collect()[0]' |
|
| 237 | + . ', '.$transformName |
|
| 238 | + . ', '.$siteId |
|
| 239 | + . ', '.$transformMode |
|
| 240 | 240 | . ') }}'; |
| 241 | 241 | $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth(' |
| 242 | - . $objectPrefix . $elementName . $sourceField . '.collect()[0]' |
|
| 243 | - . ', ' . $transformName |
|
| 244 | - . ', ' . $siteId |
|
| 245 | - . ', ' . $transformMode |
|
| 242 | + . $objectPrefix.$elementName.$sourceField.'.collect()[0]' |
|
| 243 | + . ', '.$transformName |
|
| 244 | + . ', '.$siteId |
|
| 245 | + . ', '.$transformMode |
|
| 246 | 246 | . ') }}'; |
| 247 | 247 | $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight(' |
| 248 | - . $objectPrefix . $elementName . $sourceField . '.collect()[0]' |
|
| 249 | - . ', ' . $transformName |
|
| 250 | - . ', ' . $siteId |
|
| 251 | - . ', ' . $transformMode |
|
| 248 | + . $objectPrefix.$elementName.$sourceField.'.collect()[0]' |
|
| 249 | + . ', '.$transformName |
|
| 250 | + . ', '.$siteId |
|
| 251 | + . ', '.$transformMode |
|
| 252 | 252 | . ') }}'; |
| 253 | 253 | } |
| 254 | 254 | break; |
@@ -256,21 +256,21 @@ discard block |
||
| 256 | 256 | if (!empty($ids)) { |
| 257 | 257 | $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform(' |
| 258 | 258 | . $ids[0] |
| 259 | - . ', ' . $transformName |
|
| 260 | - . ', ' . $siteId |
|
| 261 | - . ', ' . $transformMode |
|
| 259 | + . ', '.$transformName |
|
| 260 | + . ', '.$siteId |
|
| 261 | + . ', '.$transformMode |
|
| 262 | 262 | . ') }}'; |
| 263 | 263 | $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth(' |
| 264 | 264 | . $ids[0] |
| 265 | - . ', ' . $transformName |
|
| 266 | - . ', ' . $siteId |
|
| 267 | - . ', ' . $transformMode |
|
| 265 | + . ', '.$transformName |
|
| 266 | + . ', '.$siteId |
|
| 267 | + . ', '.$transformMode |
|
| 268 | 268 | . ') }}'; |
| 269 | 269 | $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight(' |
| 270 | 270 | . $ids[0] |
| 271 | - . ', ' . $transformName |
|
| 272 | - . ', ' . $siteId |
|
| 273 | - . ', ' . $transformMode |
|
| 271 | + . ', '.$transformName |
|
| 272 | + . ', '.$siteId |
|
| 273 | + . ', '.$transformMode |
|
| 274 | 274 | . ') }}'; |
| 275 | 275 | } |
| 276 | 276 | break; |
@@ -278,20 +278,20 @@ discard block |
||
| 278 | 278 | } else { |
| 279 | 279 | switch ($source) { |
| 280 | 280 | case 'sameAsSeo': |
| 281 | - $globalsSettings[$fieldName] = '{{ seomatic.meta.' . $seoField . ' }}'; |
|
| 282 | - $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.' . $seoFieldWidth . ' }}'; |
|
| 283 | - $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.' . $seoFieldHeight . ' }}'; |
|
| 281 | + $globalsSettings[$fieldName] = '{{ seomatic.meta.'.$seoField.' }}'; |
|
| 282 | + $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.'.$seoFieldWidth.' }}'; |
|
| 283 | + $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.'.$seoFieldHeight.' }}'; |
|
| 284 | 284 | break; |
| 285 | 285 | case 'fromField': |
| 286 | 286 | if (!empty($sourceField)) { |
| 287 | 287 | $globalsSettings[$fieldName] = '{{ ' |
| 288 | - . $elementName . $sourceField . '.collect()[0].url' |
|
| 288 | + . $elementName.$sourceField.'.collect()[0].url' |
|
| 289 | 289 | . ' }}'; |
| 290 | 290 | $globalsSettings[$fieldNameWidth] = '{{ ' |
| 291 | - . $elementName . $sourceField . '.collect()[0].width' |
|
| 291 | + . $elementName.$sourceField.'.collect()[0].width' |
|
| 292 | 292 | . ' }}'; |
| 293 | 293 | $globalsSettings[$fieldNameHeight] = '{{ ' |
| 294 | - . $elementName . $sourceField . '.collect()[0].height' |
|
| 294 | + . $elementName.$sourceField.'.collect()[0].height' |
|
| 295 | 295 | . ' }}'; |
| 296 | 296 | } |
| 297 | 297 | break; |
@@ -299,13 +299,13 @@ discard block |
||
| 299 | 299 | if (!empty($ids)) { |
| 300 | 300 | $globalsSettings[$fieldName] = '{{ craft.app.assets.assetById(' |
| 301 | 301 | . $ids[0] |
| 302 | - . ', ' . $siteId . ').url }}'; |
|
| 302 | + . ', '.$siteId.').url }}'; |
|
| 303 | 303 | $globalsSettings[$fieldNameWidth] = '{{ craft.app.assets.assetById(' |
| 304 | 304 | . $ids[0] |
| 305 | - . ', ' . $siteId . ').width }}'; |
|
| 305 | + . ', '.$siteId.').width }}'; |
|
| 306 | 306 | $globalsSettings[$fieldNameHeight] = '{{ craft.app.assets.assetById(' |
| 307 | 307 | . $ids[0] |
| 308 | - . ', ' . $siteId . ').height }}'; |
|
| 308 | + . ', '.$siteId.').height }}'; |
|
| 309 | 309 | } |
| 310 | 310 | break; |
| 311 | 311 | } |
