X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/6c50820df359e22fd0aa9da49c11708aa50f8253..85d01336fad3b3110a6bdb395593e29260714acc:/article.inc.php

diff --git a/article.inc.php b/article.inc.php
index 6fcb640..541d35e 100644
--- 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());
 			}
 		);
 	}