fixing page template, removing error messages when markdown or source are disabled in configuration, re-removing unnecessary spans

2017-03-12 14:16:08 +01:00
parent 97171ec1f8
commit 81b00dd422
6 changed files with 86 additions and 56 deletions
--- a/tst/ViewTest.php
+++ b/tst/ViewTest.php
@@ -104,7 +104,7 @@ class ViewTest extends PHPUnit_Framework_TestCase
                $template . ': outputs data correctly'
            );
            $this->assertRegExp(
-                '#<div[^>]+id="errormessage"[^>]*>.*' . self::$error . '</#',
+                '#<div[^>]+id="errormessage"[^>]*>.*' . self::$error . '#s',
                $content,
                $template . ': outputs error correctly'
            );