From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 30 Dec 2010 22:13:42 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: beta-freefall-0.6.2-1~169
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=3b0980f20dfa9c1554286a3107caf236667d3c22;hp=300e86aca77eb58e0cfa93b7f640ad91e67364ec;p=Sone.git

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index 76f4718..1e8776b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>sone</artifactId>
-	<version>0.3.5-1</version>
+	<version>0.3.6-1</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index c5c8835..5553574 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -78,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 3, 5, 1);
+	public static final Version VERSION = new Version(0, 3, 6, 1);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 77d401a..ad23acd 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -842,7 +842,7 @@ $(document).ready(function() {
 	getTranslation("WebInterface.DefaultText.StatusUpdate", function(defaultText) {
 		registerInputTextareaSwap("#sone #update-status .status-input", defaultText, "text", false, false);
 		$("#sone #update-status").submit(function() {
-			if ($(this).find(":input").hasClass("default")) {
+			if (!$(this).find(":input.default").hasAttr("disabled")) {
 				return false;
 			}
 			text = $(this).find(":input:enabled").val();