[phpwiki-checkins] SF.net SVN: phpwiki:[9725] trunk/lib/main.php

[<var...@us...>]

Revision: 9725
          http://sourceforge.net/p/phpwiki/code/9725
Author:   vargenau
Date:     2015-09-16 10:17:38 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
Use class error for Fatal PhpWiki Error message

Modified Paths:
--------------
    trunk/lib/main.php

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015-09-16 09:45:49 UTC (rev 9724)
+++ trunk/lib/main.php	2015-09-16 10:17:38 UTC (rev 9725)
@@ -778,13 +778,13 @@
         $pagename = $page->getName();
         if (strlen($pagename) > MAX_PAGENAME_LENGTH) {
             $pagename = substr($pagename, 0, MAX_PAGENAME_LENGTH - 1) . '…';
-            $CONTENT = HTML::div(array('class' => 'error'),
+            $CONTENT = HTML::p(array('class' => 'error'),
                 _('Page name too long'));
             GeneratePage($CONTENT, $pagename);
             $this->finish();
         }
         if (preg_match("/[<\[\{\|\"\}\]>]/", $pagename, $matches) > 0) {
-            $CONTENT = HTML::div(
+            $CONTENT = HTML::p(
                 array('class' => 'error'),
                 sprintf(_("Illegal character “%s” in page name."),
                     $matches[0]));
@@ -847,12 +847,10 @@
         $ErrorManager->flushPostponedErrors();
 
         if (!empty($errormsg)) {
-            PrintXML(HTML::br(),
-                HTML::hr(),
-                HTML::h2(_("Fatal PhpWiki Error")),
-                $errormsg);
+            PrintXML(HTML::p(array('class' => 'error'), 
+                             _("Fatal PhpWiki Error")._(': ').$errormsg));
             // HACK:
-            echo "\n</body></html>";
+            echo "\n</div>\n</div>\n</div>\n</div>\n</body>\n</html>";
         }
         if (is_object($this->_user)) {
             $this->_user->page = $this->getArg('pagename');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.