X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/674f6d3f070bcd8a08b725619e80fac0c9f72f1e..1796f2e9e3a0a72f89066c35b46751b72eaadf73:/article.inc.php

diff --git a/article.inc.php b/article.inc.php
index a39b897..ea958fa 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);
 		}
 	}
 
@@ -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('/\.html$/', $current->getFilename());
+				return preg_match('/(?<!\.inc)\.html$/', $current->getFilename());
 			}
 		);
 	}