X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/3b7350299c92ff6de3b7980791657de1f5269e48..a5cbc9ddb6ad65b17f83d2931e3318d94e498a0e:/article.inc.php

diff --git a/article.inc.php b/article.inc.php
index 98cd475..6c3ca93 100644
--- a/article.inc.php
+++ b/article.inc.php
@@ -16,7 +16,7 @@ function showdate($parts)
 
 class ArchiveArticle
 {
-	public $raw, $preface, $title, $body;
+	public $raw, $title, $body; # file contents
 	public $meta = [];
 
 	function __construct($path)
@@ -41,8 +41,11 @@ class ArchiveArticle
 			$this->meta = array_combine($meta[1], $meta[2]); # [property => content]
 		}
 
-		@list ($this->preface, $this->title, $this->body) =
-			preg_split('{<h2>(.*?)</h2>\s*}s', $this->raw, 2, PREG_SPLIT_DELIM_CAPTURE);
+		// find significant contents
+		$this->body = preg_replace('{<aside\b.*?</aside>}s', '', $this->raw);
+		if (preg_match('{<h2>(.*?)</h2>\s*(.*)}s', $this->body, $titlematch)) {
+			list (, $this->title, $this->body) = $titlematch;
+		}
 	}
 
 	function __get($col)
@@ -129,11 +132,9 @@ class ArchiveArticle
 		}
 
 		# paragraph contents following the page header if any
-		$offset = strpos($this->raw, '</h2>');
-		$offset = $offset ? $offset + 5 : 0;
 		if (preg_match('{
-			\G (?> \s+ | <aside\b.*?</aside> | <div [^>]*> | \[\[[^]]*\]\] )* <p> \s* (.*?) </p>
-		}sx', $this->raw, $bodyp, 0, $offset)) {
+			\G (?> \s+ | <div [^>]*> | \[\[[^]]*\]\] )* <p> \s* (.*?) </p>
+		}sx', $this->body, $bodyp, 0)) {
 			return $bodyp[1];
 		}
 	}