diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-24 15:59:03 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-24 15:59:03 -0700 |
| commit | d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653 (patch) | |
| tree | 20c715f196dbbca6cc8b54d426ca98ac3d1792d1 /include/comanche.php | |
| parent | 52e38d7c24d9e2517e4691a0f2548a695e7806da (diff) | |
| parent | 13546167877322afa274a2540656f525e55d3b48 (diff) | |
| download | volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.tar.gz volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.tar.bz2 volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/comanche.php')
| -rw-r--r-- | include/comanche.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/comanche.php b/include/comanche.php index 9fe7dc255..65f64be5c 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -170,17 +170,12 @@ function comanche_block($s, $class = '') { if($r) { $o .= (($var['wrap'] == 'none') ? '' : '<div class="' . $class . '">'); - if($r[0]['title'] && trim($r[0]['title']) != '$content') { + if($r[0]['title'] && trim($r[0]['body']) != '$content') { $o .= '<h3>' . $r[0]['title'] . '</h3>'; } - if($r[0]['title'] && trim($r[0]['title']) === '$content' && get_app()->data['webpage'][0]['title']) { - $o .= '<h3>' . get_app()->page['title'] . '</h3>'; - } - - if(trim($r[0]['body']) === '$content') { - $o .= prepare_text(get_app()->page['content'], get_app()->data['webpage'][0]['mimetype']); + $o .= get_app()->page['content']; } else { $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); |