diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-17 16:35:17 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-17 16:35:17 -0700 |
| commit | a7071b17c0978bf8a68574a178c67a275277177c (patch) | |
| tree | 334db2280679809f735881de69af27ef10faf327 /include | |
| parent | 9a67ec8bd4242a3e025da44364f44bf24b2c5c54 (diff) | |
| parent | f987f4a04922234c809384fde108f94292c551ac (diff) | |
| download | volse-hubzilla-a7071b17c0978bf8a68574a178c67a275277177c.tar.gz volse-hubzilla-a7071b17c0978bf8a68574a178c67a275277177c.tar.bz2 volse-hubzilla-a7071b17c0978bf8a68574a178c67a275277177c.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/comanche.php | 9 |
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>'); } } |