Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / lib / error.php

diff --git a/lib/error.php b/lib/error.php
index 4024a9affc37290f1b530afcbce6c9215eb8d128..e7bdd0570703efc048c2e4b7481e3e9514132ad4 100644 (file)
--- a/lib/error.php
+++ b/lib/error.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/info.php';
-
 /**
  * Base class for displaying HTTP errors
  *
@@ -119,6 +117,6 @@ class ErrorAction extends InfoAction
         $this->elementStart('body');
         $this->element('p', array('id' => 'error'), $this->message);
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 }