Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po

1 files changed, 8 insertions, 1 deletions

diff --git a/include/comanche.php b/include/comanche.php
index 3030ae5c6..fc4e4004b 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -166,12 +166,19 @@ function comanche_block($s, $class = '') {
 			intval($channel_id),
 			dbesc($name)
 		);
+
 		if($r) {
 			$o .= (($var['wrap'] == 'none') ? '' : '<div class="' . $class . '">');
 			if($r[0]['title'])
 				$o .= '<h3>' . $r[0]['title'] . '</h3>';
 
-			$o .= prepare_text($r[0]['body'], $r[0]['mimetype']);
+			if($r[0]['body'] === '$content') {
+				$o .= prepare_text(get_app()->data['webpage'][0]['body'], get_app()->data['webpage'][0]['mimetype']);
+			}
+			else {
+				$o .= prepare_text($r[0]['body'], $r[0]['mimetype']);
+			}
+
 			$o .= (($var['wrap'] == 'none') ? '' : '</div>');
 		}
 	}