Merge pull request #127 from green-ponies/master

Typos

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"],
 			);
         }
 

install.php

@@ -44,6 +44,20 @@
 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__."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 +68,9 @@ 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
+	// 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.
-	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 ) ||