X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/f46f7a3b080b947af711ab35601c26f6423cbe8b..92e54cde1cabdb24dcde3937d390a5b176032be5:/nieuws.inc.php
diff --git a/nieuws.inc.php b/nieuws.inc.php
index cafd4ec..40432a9 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -78,11 +78,14 @@ class ArchiveArticle
{
$this->title;
$rest = fread($this->file, filesize($this->page));
- if ( preg_match('{\n
(]*>)
}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
- $this->img = $img[1][0];
+ if ( preg_match('{
+ \n (?: < (?: p | figure [^>]* ) >\s* )+ (]*>) | \n
+ }x', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+ if (isset($img[1])) {
+ $this->img = $img[1][0];
+ }
return substr($rest, 0, $img[0][1]);
}
- $this->img = NULL;
return $rest;
}
@@ -95,6 +98,7 @@ class ArchiveArticle
function img()
{
+ $this->img = NULL;
$this->body;
return $this->img;
}
@@ -109,7 +113,10 @@ class ArchiveArticle
function thumb($size = '300x')
{
if (!$this->image or $this->image[0] !== '/') return;
- return preg_replace('{^(?:/thumb/[^/]*)?}', "thumb/$size", $this->image);
+ return preg_replace(
+ ['{^(?:/thumb/[^/]*)?}', '/\.groot(?=\.\w+$)/'], ["thumb/$size", ''],
+ $this->image
+ );
}
}