[Fixed] Fixed an issue with getJsonLD($element)

nystudio107 · Jul 27, 2016 · 2437c82 · 2437c82
1 parent 7a41cb2
commit 2437c82
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -56,6 +56,7 @@ Some things to do, and ideas for potential features:
 * [Added] Added modified_time and published_time to OpenGraph articles when an SEOmatic Meta FieldType is used
 * [Improved] Safeguard against 'Undefined index: seoImageTransform'
 * [Fixed] Handle non-posted entries
+* [Fixed] Fixed an issue with getJsonLD($element)
 * [Improved] Updated the README.md
 
 ### 1.1.27 -- 2016.07.26

diff --git a/models/Seomatic_MetaFieldModel.php b/models/Seomatic_MetaFieldModel.php
@@ -71,13 +71,13 @@ public function getJsonLD($element)
         {
             $entryMeta = craft()->seomatic->getMetaFromElement($element);
             if ($entryMeta)
-                craft()->seomatic->setEntryMeta($entryMeta, $element->url);
+                $entryMeta = craft()->seomatic->setEntryMeta($entryMeta, $element->url);
         }
 
         $metaVars = craft()->seomatic->getGlobals('', $locale);
         $result = craft()->seomatic->getMainEntityOfPageJSONLD($entryMeta, $metaVars['seomaticIdentity'], $locale, false);
 
-        return rtrim($result);
+        return $result;
     }
 
 

diff --git a/releases.json b/releases.json
@@ -7,6 +7,7 @@
             "[Added] Added modified_time and published_time to OpenGraph articles when an SEOmatic Meta FieldType is used",
             "[Improved] Safeguard against 'Undefined index: seoImageTransform'",
             "[Fixed] Handle non-posted entries",
+            "[Fixed] Fixed an issue with getJsonLD($element)",
             "[Improved] Updated the README.md"
         ]
     },
@@ -18,7 +19,7 @@
             "[Fixed] Fixed a regression with Entry Meta cascade",
             "[Fixed] Fixed an issue with SEOmatic FieldTypes on categories",
             "[Fixed] Fixed invalid releases.json",
-            "[Improved] We now strip all control characters (including \n and \r) from the JSON-LD arrays",
+            "[Improved] We now strip all control characters from the JSON-LD arrays",
             "[Improved] Updated the README.md"
         ]
     },

diff --git a/services/SeomaticService.php b/services/SeomaticService.php
@@ -781,6 +781,7 @@ public function setEntryMeta($entryMeta, $entryMetaUrl)
                 $meta['seoMainEntityOfPage'] ="";
         }
         $this->entryMeta = $meta;
+        return $meta;
     } /* -- setEntryMeta */
 
 /* --------------------------------------------------------------------------------