some fixes

Author: rhukster

CHANGELOG.md

@@ -1,9 +1,19 @@
+# v5.2.0
+## 06/02/2024
+
+1. [](#new)
+   * Added the ability to display a section from another page. See README.txt for example
+1. [](#bugfix)
+   * Fix for `lorem` shortcode that broke when count was provided
+
+
 # v5.1.3
 ## 06/01/2022
 
 1. [](#improved)
    * Added a new `display` CLI command to show all registered shortcodes
 
+
 # v5.1.2
 ## 05/10/2022
 

README.md

@@ -284,12 +284,20 @@ This we be removed from the page content and made available in Twig variables so
 
 #### Sections from other pages
 
-You can even retrieve a section from another page utilizing the shortcodes as they are stored in the page's `contentMeta` with this syntax:
+You can even retrieve a section from another page utilizing the shortcodes as they are stored in the page's `contentMeta` with this Twig syntax:
 
 ```
 <div id="author">{{ page.find('/my/custom/page').contentMeta.shortcodeMeta.shortcode.section.author }}</div>
 ```
 
+There may be a scenario where you define a section in another page, but want to use it in the content of a page.  You can now do so with the same `[section]` shortcode by providing the page where the section is defined, and also the name of the section with no shortcode body.  For example
+
+```markdown
+[section page="/my/custom/page" name="author" /]
+```
+
+!! NOTE for this to work, the shortcode needs to be defined a parent page, or page that has been processed before the current page.
+
 #### Notice
 
 A useful shortcode that performs a similar job to the [markdown-notices](https://github.com/getgrav/grav-plugin-markdown-notices) plugins, allows you to easily create simple notice blocks as seen on http://learn.getgrav.org and http://getgrav.org.  To use simply use the following syntax:

classes/shortcodes/LoremShortcode.php

@@ -145,7 +145,7 @@ public function words($count = 1, $tags = false, $array = false)
                 }
             }
         }
-        $words = array_slice($words, 0, $count);
+        $words = array_slice($words, 0, (int) $count);
 
         return $this->output($words, $tags, $array);
     }

classes/shortcodes/SectionShortcode.php

@@ -9,6 +9,17 @@ public function init()
     {
         $this->shortcode->getHandlers()->add('section', function(ShortcodeInterface $sc) {
             $name = $sc->getParameter('name');
+            $page = $sc->getParameter('page');
+            $content = $sc->getContent();
+
+            if (empty($content) && isset($page)) {
+                if ($target = $this->grav['pages']->find($page)) {
+                    if ($shortcodeObject = $target->contentMeta()['shortcodeMeta']['shortcode'][$sc->getName()][$name] ?? false) {
+                        return (string) $shortcodeObject;
+                    }
+                }
+            }
+
             $object = new \Grav\Plugin\ShortcodeCore\ShortcodeObject($name, $sc->getContent());
             $this->shortcode->addObject($sc->getName(), $object);
         });