Merge remote branch 'upstream/dev' into dev

Conflicts:
	themes/default/_head.twig

1 files changed, 7 insertions, 1 deletions

diff --git a/index.php b/index.php
index 4aebfe10..22696c6f 100644
--- a/index.php
+++ b/index.php
@@ -8,6 +8,7 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
+define ('POCHE', '1.0.0');
 require_once 'inc/poche/global.inc.php';
 
 # Start Poche
@@ -35,7 +36,12 @@ $tpl_vars = array(
 if (! empty($notInstalledMessage)) {
     if (! Poche::$canRenderTemplates || ! Poche::$configFileAvailable) {
         # We cannot use Twig to display the error message 
-        die($notInstalledMessage);
+        echo '<h1>Errors</h1><ol>';
+        foreach ($notInstalledMessage as $message) {
+            echo '<li>' . $message . '</li>';
+        }
+        echo '</ol>';
+        die();
     } else {
         # Twig is installed, put the error message in the template
         $tpl_file = Tools::getTplFile('error');