login: title with value of redirect target

[minimedit.git] / nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index a0fa821b93647356efe421eb9db95198ee997197..40432a9c22cfc6aa1411ac866e6cf9e5e577ac9a 100644 (file)
--- 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 [^>]* ) > (<img\ [^>]*>) | \n <hr\ />}x', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+               if ( preg_match('{
+                       \n (?: < (?: p | figure [^>]* ) >\s* )+ (<img\ [^>]*>) | \n <hr\ />
+               }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
+               );
        }
 }