Merge branch 'integration'

symphonists · Jul 7, 2021 · c00de1b · c00de1b
2 parents 3cbe0aa + 171dfd9
commit c00de1b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 30 deletions.
diff --git a/extension.driver.php b/extension.driver.php
@@ -144,7 +144,7 @@ private function buildParams()
                 'this-month' => $date->format('m'),
                 'this-day' => $date->format('d'),
                 'timezone' => $date->format('P'),
-                'website-name' => Symphony::Configuration()->get('sitename', 'general'),
+                'website-name' => General::sanitize(Symphony::Configuration()->get('sitename', 'general')),
                 'root' => URL,
                 'workspace' => URL . '/workspace',
                 'http-host' => HTTP_HOST,
@@ -168,7 +168,7 @@ private function buildEntry($handle = 'reflection-field', $entry)
 
             // Section context
             $section_data = SectionManager::fetch($entry->get('section_id'));
-            $section = new XMLElement('section', $section_data->get('name'));
+            $section = new XMLElement('section', General::sanitize($section_data->get('name')));
             $section->setAttribute('id', $entry->get('section_id'));
             $section->setAttribute('handle', $section_data->get('handle'));
 

diff --git a/extension.meta.xml b/extension.meta.xml
@@ -18,6 +18,9 @@
 		</author>
 	</authors>
 	<releases>
+		<release version="2.0.5" date="2021-01-11" min="2.3" max="2.x.x">
+			- Fix error with ampersands in website- and section-names [#42](https://github.com/symphonists/reflectionfield/issues/42)
+		</release>
 		<release version="2.0.4" date="2018-06-02" min="2.3" max="2.x.x">
 			- Fix XPath-expressions [#35](https://github.com/symphonists/reflectionfield/issues/35)
 		</release>

diff --git a/readme.md b/readme.md
@@ -9,34 +9,34 @@ When saving an entry Reflection field creates an internal `data` structure simil
 
 ```xml
 <data>
-    <params>
-        <today>2016-08-02</today>
-        <current-time>12:34</current-time>
-        <this-year>2016</this-year>
-        <this-month>08</this-month>
-        <this-day>02</this-day>
-        <timezone>+02:00</timezone>
-        <website-name>Example Website</website-name>
-        <root>https://example.com</root>
-        <workspace>https://example.com/workspace</workspace>
-        <http-host>example.com</http-host>
-        <upload-limit>5242880</upload-limit>
-        <symphony-version>2.7.0</symphony-version>
-    </params>
-    <reflection-field-handle>
-        <section id="…" handle="…">…</section>
-        <entry id="…">
-            <field-one>…</field-one>
-            <field-two>
-                <item handle="…">…</item>
-                <item handle="…">…</item>
-            </field-two>
-            <system-date>
-                <created iso="…" timestamp="…" time="…" weekday="…" offset="…">…</created>
-                <modified iso="…" timestamp="…" time="…" weekday="…" offset="…">…</modified>
-            </system-date>
-        </entry>
-    </reflection-field-handle>
+	<params>
+		<today>2021-01-12</today>
+		<current-time>20:34</current-time>
+		<this-year>2021</this-year>
+		<this-month>01</this-month>
+		<this-day>12</this-day>
+		<timezone>+02:00</timezone>
+		<website-name>Example Website</website-name>
+		<root>https://example.com</root>
+		<workspace>https://example.com/workspace</workspace>
+		<http-host>example.com</http-host>
+		<upload-limit>5242880</upload-limit>
+		<symphony-version>2.7.10</symphony-version>
+	</params>
+	<reflection-field-handle>
+		<section id="…" handle="…">…</section>
+		<entry id="…">
+			<field-one>…</field-one>
+			<field-two>
+				<item handle="…">…</item>
+				<item handle="…">…</item>
+			</field-two>
+			<system-date>
+				<created iso="…" timestamp="…" time="…" weekday="…" offset="…">…</created>
+				<modified iso="…" timestamp="…" time="…" weekday="…" offset="…">…</modified>
+			</system-date>
+		</entry>
+	</reflection-field-handle>
 </data>
 ```