From 01306712b72b447beb1eda99c136d8b0b1ded094 Mon Sep 17 00:00:00 2001
From: "green-ponies (jgen)" <jgen.tech@gmail.com>
Date: Thu, 9 Feb 2012 15:10:53 -0500
Subject: [PATCH 1/3] Shish you broke this~

---
 contrib/notes/theme.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/notes/theme.php b/contrib/notes/theme.php
index 0da3a29e..bba37b28 100644
--- a/contrib/notes/theme.php
+++ b/contrib/notes/theme.php
@@ -57,12 +57,12 @@ class NotesTheme extends Themelet {
             $parsedNote = str_replace("\r", "\\r", $parsedNote);
 
             $to_json[] = array(
-				'x1': $note["x1"],
-                'y1': $note["y1"],
-                'height': $note["height"],
-                'width': $note["width"],
-                'note': $parsedNote,
-                'note_id': $note["id"],
+				'x1' => $note["x1"],
+                'y1' => $note["y1"],
+                'height' => $note["height"],
+                'width' => $note["width"],
+                'note' => $parsedNote,
+                'note_id' => $note["id"],
 			);
         }
 

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 2/3] 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 ) ||

From a8c228186a2f3eb73a29a0174108af5a6233e3b4 Mon Sep 17 00:00:00 2001
From: "green-ponies (jgen)" <jgen.tech@gmail.com>
Date: Thu, 9 Feb 2012 15:37:40 -0500
Subject: [PATCH 3/3] bugs~

---
 install.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/install.php b/install.php
index 30cfe291..01938651 100755
--- a/install.php
+++ b/install.php
@@ -55,8 +55,6 @@ assert_options(ASSERT_BAIL, 1);
 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";
 
@@ -70,7 +68,10 @@ if(is_readable("config.php")) {
 		<div id="iblock">
 			<h1>Shimmie Repair Console</h1>
 <?php
-	
+	// Load the config
+	require_once __SHIMMIE_ROOT__."config.php";			// Load user/site specifics First
+	require_once __SHIMMIE_ROOT__."core/default_config.inc.php";	// Defaults for the rest.
+
 	if (
 	      ( array_key_exists('dsn', $_SESSION) && $_SESSION['dsn'] === DATABASE_DSN ) ||
 	      ( array_key_exists('dsn', $_POST)    && $_POST['dsn']    === DATABASE_DSN )