From 031b888e2c447048b5459e5e8f1a2afd34f695cf Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Wed, 12 Mar 2014 17:13:58 +0000
Subject: [PATCH 1/4] Stick help in a template

---
 mod/help.php      | 10 +++++++---
 view/tpl/help.tpl |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 view/tpl/help.tpl

diff --git a/mod/help.php b/mod/help.php
index aa0ee8ae6..81ecd6ba9 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -76,14 +76,18 @@ function help_content(&$a) {
 	$text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text);
 
 	if($doctype === 'html')
-		return $text;
+		$content = $text;
 	if($doctype === 'markdown')	
-		return Markdown($text);
+		$content = Markdown($text);
 	if($doctype === 'bbcode') {
 		require_once('include/bbcode.php');
-		return bbcode($text);
+		$content = bbcode($text);
 	} 
 
+	return replace_macros(get_markup_template("help.tpl"), array(
+		'$content' => $content
+	));
+
 }
 
 
diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl
new file mode 100644
index 000000000..e01243077
--- /dev/null
+++ b/view/tpl/help.tpl
@@ -0,0 +1,3 @@
+<div id = "help-content" class="generic-content-wrapper">
+{{$content}}
+</div>

From b30ddfaaf907e46537fa82520d76df058938a6b5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 12 Mar 2014 16:21:20 -0700
Subject: [PATCH 2/4] fix colors on input elements which bootstrap set to
 "inherit" and doesn't play nicely with dark themes.

---
 version.inc                       | 2 +-
 view/theme/redbasic/css/style.css | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/version.inc b/version.inc
index 81c727eb1..424e69299 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-03-11.613
+2014-03-12.614
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7cdc55644..d6374082d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -79,6 +79,11 @@ input[type="submit"] {
 	text-decoration: none;
 }
 
+button, input, optgroup, select, textarea {
+	color: #000;
+}
+
+
 pre code {
 	border: none;
 }

From 74b8a386450e34f4a3f6f1432c2ab82fdb0e85c8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 12 Mar 2014 19:04:20 -0700
Subject: [PATCH 3/4] json_return_and_dir is a typo

---
 mod/post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/post.php b/mod/post.php
index 54d0d8db9..140b3f1e5 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -265,7 +265,7 @@ function post_init(&$a) {
 		} else {
 			if($test) {
 				$ret['message'] .= 'auth failure. ' . print_r($_REQUEST,true) . print_r($j,true) . EOL;
-				json_return_and_dir($ret);
+				json_return_and_die($ret);
 			}
 
 			logger('mod_zot: magic-auth failure - not authenticated: ' . $x[0]['xchan_addr']);

From 5a8be68900250267aa01923f87cf3978c50421e8 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Thu, 13 Mar 2014 02:09:45 +0000
Subject: [PATCH 4/4] json_return_and_dir isn't a thing

---
 mod/post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/post.php b/mod/post.php
index 140b3f1e5..95c984b40 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -281,7 +281,7 @@ function post_init(&$a) {
 
 		if($test) {
 			$ret['message'] .= 'auth failure fallthrough ' . print_r($_REQUEST,true) . print_r($j,true) . EOL;
-			json_return_and_dir($ret);
+			json_return_and_die($ret);
 		}
 
 		if(strstr($desturl,z_root() . '/rmagic'))