Improved image parsing

sal0max · Jan 6, 2021 · 20de209 · 20de209
1 parent b2ba6df
commit 20de209
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 
 1. [](#improved)
    * Updated GLightbox to 3.0.7
+2. [](#improved)
+   * Improved image parsing
 
 # v1.0.0
 ##  12/30/2020

diff --git a/shortcodes/GalleryPlusPlusShortcode.php b/shortcodes/GalleryPlusPlusShortcode.php
@@ -41,10 +41,16 @@ public function init()
             // find all images, that a gallery contains
             $content = $sc->getContent();
 
+            // check validity
+            if (str_contains($content, "<pre>"))
+                return "<p style='color: #d40000; font-weight: bold; padding: 1rem 0;'>[Shortcode Gallery++] Error:<br> 
+                        &gt; Images provided got parsed as code block.<br>
+                        &gt; Please check your markdown file and make sure the images aren't indented by tab or more than three spaces.</p>";
+
             // remove <p> tags
-            $content = preg_replace('(^\n?<p>|</p>$)', '', $content);
+            $content = preg_replace('(<p>|</p>)', '', $content);
             // split up images to arrays of img links
-            preg_match_all('|<img.*/?>|', $content, $images);
+            preg_match_all('|<img.*?/>|', $content, $images);
             // get all links
             preg_match_all('|src="(.*?)"|', $content, $links);
             // get all alt descriptions