Fix importing rss_displayer blocks from CIF files

mlocati-forks · Nov 23, 2023 · ff24fa1 · ff24fa1
1 parent 00cefc1
commit ff24fa1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/concrete/blocks/rss_displayer/controller.php b/concrete/blocks/rss_displayer/controller.php
@@ -269,4 +269,25 @@ public function getSearchableContent()
 
         return $searchContent;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see \Concrete\Core\Block\BlockController::getImportData()
+     */
+    protected function getImportData($blockNode, $page)
+    {
+        $data = parent::getImportData($blockNode, $page);
+        $dateFormat = $data['dateFormat'] ?? '';
+        if ($dateFormat !== '') {
+            if (array_key_exists($dateFormat, $this->getDefaultDateTimeFormats())) {
+                $data['standardDateFormat'] = $dateFormat;
+            } else {
+                $data['customDateFormat'] = $dateFormat;
+            }
+        }
+        unset($data['dateFormat']);
+
+        return $data;
+    }
 }
diff --git a/concrete/config/install/base/single_pages/dashboard.xml b/concrete/config/install/base/single_pages/dashboard.xml
@@ -1608,7 +1608,7 @@
                                             <record>
                                                 <title>Tutorials</title>
                                                 <url>https://documentation.concretecms.org/rss/tutorials</url>
-                                                <dateFormat>longDate</dateFormat>
+                                                <dateFormat>:longDate:</dateFormat>
                                                 <itemsToDisplay>1</itemsToDisplay>
                                                 <showSummary>1</showSummary>
                                                 <launchInNewWindow>1</launchInNewWindow>
@@ -1625,7 +1625,7 @@
                                             <record>
                                                 <title>News from concretecms.com</title>
                                                 <url>https://www.concretecms.com/rss/blog</url>
-                                                <dateFormat>longDate</dateFormat>
+                                                <dateFormat>:longDate:</dateFormat>
                                                 <itemsToDisplay>3</itemsToDisplay>
                                                 <showSummary>1</showSummary>
                                                 <launchInNewWindow>1</launchInNewWindow>

diff --git a/concrete/config/install/upgrade/desktops.xml b/concrete/config/install/upgrade/desktops.xml
@@ -50,7 +50,7 @@
                                             <record>
                                                 <title>Tutorials</title>
                                                 <url>http://documentation.concretecms.org/rss/tutorials</url>
-                                                <dateFormat>longDate</dateFormat>
+                                                <dateFormat>:longDate:</dateFormat>
                                                 <itemsToDisplay>1</itemsToDisplay>
                                                 <showSummary>1</showSummary>
                                                 <launchInNewWindow>1</launchInNewWindow>
@@ -105,7 +105,7 @@
                             <record>
                                 <title>News from Concrete</title>
                                 <url>http://www.concretecms.com/rss/blog</url>
-                                <dateFormat>longDate</dateFormat>
+                                <dateFormat>:longDate:</dateFormat>
                                 <itemsToDisplay>3</itemsToDisplay>
                                 <showSummary>1</showSummary>
                                 <launchInNewWindow>1</launchInNewWindow>