From 9373b26625fc46ea508e2dcb29d0e7b94bba4a6d Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Wed, 14 Mar 2012 15:06:30 +0000
Subject: [PATCH 1/3] In jquery, $("#foo") is always true (an empty object)

---
 lib/shimmie.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/shimmie.js b/lib/shimmie.js
index b277b834..7b5ef6f3 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
 
 	$(".shm-clink").each(function(idx, elm) {
 		var target_id = $(elm).data("clink-sel");
-		if(target_id && $(target_id)) {
+		if(target_id && $(target_id).length > 0) {
 			// if the target comment is already on this page, don't bother
 			// switching pages
 			$(elm).attr("href", target_id);

From 7a6741d202f75145db47c190364da198362caf74 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Wed, 14 Mar 2012 18:11:46 +0000
Subject: [PATCH 2/3] TYPE -> ENGINE

---
 ext/upgrade/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php
index 5471d573..f5db9a10 100644
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -44,7 +44,7 @@ class Upgrade extends Extension {
 				$tables = $database->get_col("SHOW TABLES");
 				foreach($tables as $table) {
 					log_info("upgrade", "converting $table to innodb");
-					$database->execute("ALTER TABLE $table TYPE=INNODB");
+					$database->execute("ALTER TABLE $table ENGINE=INNODB");
 				}
 			}
 

From 6204046be5365ddd03392358edf3880973d61658 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Wed, 14 Mar 2012 18:16:23 +0000
Subject: [PATCH 3/3] upgrade notes

---
 README.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 26e403b2..b10dca09 100644
--- a/README.txt
+++ b/README.txt
@@ -52,6 +52,11 @@ The rest should be automatic, just unzip into a clean folder and copy across
 config.php, images and thumbs folders from the old version. This
 includes automatically messing with the database -- back it up first!
 
+If there are any errors with the upgrade process, "in_upgrade=true" will
+be left in the config table and the process will be paused for the admin
+to investigate. Deleting this config entry and refreshing the page should
+continue the upgrade from where it left off.
+
 
 Upgrade from earlier versions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -63,7 +68,6 @@ enough to be a pain.
 
 Custom Configuration
 ~~~~~~~~~~~~~~~~~~~~
-
 Various aspects of Shimmie can be configured to suit your site specific
 needs via the file "config.php" (created after installation).
 Take a look at "core/default_config.inc.php" for the available options