Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

2 files changed, 9 insertions, 12 deletions

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index a1666e148..e636e5614 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -335,6 +335,8 @@ class ThreadItem {
 			'wall' => t('Wall-to-Wall'),
 			'vwall' => t('via Wall-To-Wall:'),
 			'profile_url' => $profile_link,
+			'thread_action_menu' => thread_action_menu($item,$conv->get_mode()),
+			'thread_author_menu' => thread_author_menu($item,$conv->get_mode()),
 			'item_photo_menu' => item_photo_menu($item),
 			'dreport' => $dreport,
 			'name' => $profile_name,
diff --git a/Zotlabs/Module/Sslify.php b/Zotlabs/Module/Sslify.php
index db73f85e0..2891f3691 100644
--- a/Zotlabs/Module/Sslify.php
+++ b/Zotlabs/Module/Sslify.php
@@ -10,21 +10,16 @@ class Sslify extends \Zotlabs\Web\Controller {
 			$h = explode("\n",$x['header']);
 			foreach ($h as $l) {
 				list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-				$hdrs[$k] = $v;
+				$hdrs[strtolower($k)] = $v;
 			}
-			if (array_key_exists('Content-Type', $hdrs))
-				$type = $hdrs['Content-Type'];
-		
-			header('Content-Type: ' . $type);
+			if (array_key_exists('content-type', $hdrs)) {
+				$type = $hdrs['content-type'];	
+				header('Content-Type: ' . $type);
+			}
+
 			echo $x['body'];
 			killme();
 		}
 		killme();
-		// for some reason when this fallback is in place - it gets triggered
-		// often, (creating mixed content exceptions) even though there is 
-		// nothing obvious missing on the page when we bypass it. 
-		goaway($_REQUEST['url']);
-	}
-	
-	
+	}	
 }