From 983c0d96b85a89e2c12957e7ea0cd074c28e5116 Mon Sep 17 00:00:00 2001
From: "green-ponies (jgen)" <jgen.tech@gmail.com>
Date: Thu, 9 Feb 2012 15:33:40 -0500
Subject: [PATCH] Fixing bug with installer. (thanks RainbowDash)

---
 install.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/install.php b/install.php
index 139bc4c5..30cfe291 100755
--- a/install.php
+++ b/install.php
@@ -44,6 +44,22 @@
 assert_options(ASSERT_ACTIVE, 1);
 assert_options(ASSERT_BAIL, 1);
 
+/*
+ * Compute the path to the folder containing "install.php" and 
+ * store it as the 'Shimmie Root' folder for later on.
+ *
+ * Example:
+ *	__SHIMMIE_ROOT__ = '/var/www/shimmie2/'
+ *
+ */
+define('__SHIMMIE_ROOT__', trim( remove_trailing_slash( dirname(__FILE__) ) ) . '/' ); 
+
+// Pull in necessary files
+require_once __SHIMMIE_ROOT__."config.php";			// Load user/site specifics First
+require_once __SHIMMIE_ROOT__."core/default_config.inc.php";	// Defaults for the rest.
+require_once __SHIMMIE_ROOT__."core/util.inc.php";
+require_once __SHIMMIE_ROOT__."core/database.class.php";
+
 /*
  * This file lets anyone destroy the database -- disable it
  * as soon as the admin is done installing for the first time
@@ -54,22 +70,6 @@ if(is_readable("config.php")) {
 		<div id="iblock">
 			<h1>Shimmie Repair Console</h1>
 <?php
-
-	/*
-	 * Compute the path to the folder containing "install.php" and 
-	 * store it as the 'Shimmie Root' folder for later on.
-	 *
-	 * Example:
-	 *	__SHIMMIE_ROOT__ = '/var/www/shimmie2/'
-	 *
-	 */
-	define('__SHIMMIE_ROOT__', trim( remove_trailing_slash( dirname(__FILE__) ) ) . '/' ); 
-
-	// Pull in necessary files
-	require_once __SHIMMIE_ROOT__."config.php";			// Load user/site specifics First
-	require_once __SHIMMIE_ROOT__."core/default_config.inc.php";	// Defaults for the rest.
-	require_once __SHIMMIE_ROOT__."core/util.inc.php";
-	require_once __SHIMMIE_ROOT__."core/database.class.php";
 	
 	if (
 	      ( array_key_exists('dsn', $_SESSION) && $_SESSION['dsn'] === DATABASE_DSN ) ||