X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/fd777fa3e0ebcb76bb6fdfadbc257b451d5db925..20ead233cabc8fefcd86bd99f08dadc261669300:/nieuws.inc.php?ds=sidebyside
diff --git a/nieuws.inc.php b/nieuws.inc.php
index a0fa821..40432a9 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -78,7 +78,9 @@ class ArchiveArticle
{
$this->title;
$rest = fread($this->file, filesize($this->page));
- if ( preg_match('{\n < (?: p | figure [^>]* ) > (]*>) | \n
}x', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+ if ( preg_match('{
+ \n (?: < (?: p | figure [^>]* ) >\s* )+ (]*>) | \n
+ }x', $rest, $img, PREG_OFFSET_CAPTURE) ) {
if (isset($img[1])) {
$this->img = $img[1][0];
}
@@ -111,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
+ );
}
}