That merge did NOT go well.
authorDan
Sat, 20 Oct 2007 22:16:25 -0400
changeset 198 9e09480cb38f
parent 194 bf0fdec102e9
child 199 b21c37981b88
That merge did NOT go well.
install.php
--- a/install.php	Sat Oct 20 21:46:05 2007 -0400
+++ b/install.php	Sat Oct 20 22:16:25 2007 -0400
@@ -14,7 +14,8 @@
  */
  
 @include('config.php');
-if( ( defined('ENANO_INSTALLED') || defined('MIDGET_INSTALLED') ) && ((isset($_GET['mode']) && ($_GET['mode']!='finish' && $_GET['mode']!='css')) || !isset($_GET['mode']))) {
+if( ( defined('ENANO_INSTALLED') || defined('MIDGET_INSTALLED') ) && ((isset($_GET['mode']) && ($_GET['mode']!='finish' && $_GET['mode']!='css')) || !isset($_GET['mode'])))
+{
   $_GET['title'] = 'Enano:Installation_locked';
   require('includes/common.php');
   die_friendly('Installation locked', '<p>The Enano installer has found a Enano installation in this directory. You MUST delete config.php if you want to re-install Enano.</p><p>If you wish to upgrade an older Enano installation to this version, please use the <a href="upgrade.php">upgrade script</a>.</p>');