reply: accept image uploads with messages

[minimedit.git] / article.inc.php

diff --git a/article.inc.php b/article.inc.php
index 6fcb640dc5e8ee2f857999010fc693814a738557..541d35e9f0958b78a606ce0ec71bdd1a808f8520 100644 (file)
--- a/article.inc.php
+++ b/article.inc.php
@@ -35,7 +35,7 @@ class ArchiveArticle
                        }
 
                        @list ($this->preface, $this->title, $this->body) =
-                               preg_split('{<h2>(.*?)</h2>\s*}', $this->raw, 2, PREG_SPLIT_DELIM_CAPTURE);
+                               preg_split('{<h2>(.*?)</h2>\s*}s', $this->raw, 2, PREG_SPLIT_DELIM_CAPTURE);
                }
        }
 
@@ -109,7 +109,7 @@ class ArchiveArticle
 
                # starting paragraph for documents without title (assumed simple/partial)
                if (strpos($this->raw, '<h2') === FALSE and preg_match('{
-                       \A <p> \s* (.*?) </p>
+                       \A (?: <div [^>]*> \s* )* <p> \s* (.*?) </p>
                }sx', $this->raw, $bodyp)) {
                        return $bodyp[1];
                }
@@ -157,9 +157,12 @@ class PageSearch
                                        # ignore symlinks, original contents only
                                        return FALSE;
                                }
+                               if ($current->isDir()) {
+                                       # traverse subdirectories unless untracked in any amount
+                                       return !file_exists("$current/.gitignore");
+                               }
                                # match **/*.html
-                               return $current->isDir()
-                                       || preg_match('/(?<!\.inc)\.html$/', $current->getFilename());
+                               return preg_match('/(?<!\.inc)\.html$/', $current->getFilename());
                        }
                );
        }