diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 15:58:13 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 15:58:13 -0700 |
| commit | 2dd0e7f6bd02748567d8b21f793bd8c6f15f55ce (patch) | |
| tree | 9d4182a586b5d2bd68baaa2d5b03f0c51828bb0d /include | |
| parent | 51db7536380d70e2047aa91c3a12809cc3444aa8 (diff) | |
| parent | d42d7d0532adb27c966c9ee2ddd76e33c0d0972f (diff) | |
| download | volse-hubzilla-2dd0e7f6bd02748567d8b21f793bd8c6f15f55ce.tar.gz volse-hubzilla-2dd0e7f6bd02748567d8b21f793bd8c6f15f55ce.tar.bz2 volse-hubzilla-2dd0e7f6bd02748567d8b21f793bd8c6f15f55ce.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'include')
| -rw-r--r-- | include/comanche.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/comanche.php b/include/comanche.php index fc4e4004b..93cbd8b12 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -169,10 +169,17 @@ function comanche_block($s, $class = '') { if($r) { $o .= (($var['wrap'] == 'none') ? '' : '<div class="' . $class . '">'); - if($r[0]['title']) + + if($r[0]['title'] && trim($r[0]['title']) != '$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()->data['webpage'][0]['title'] . '</h3>'; + } + - if($r[0]['body'] === '$content') { + if(trim($r[0]['body']) === '$content') { $o .= prepare_text(get_app()->data['webpage'][0]['body'], get_app()->data['webpage'][0]['mimetype']); } else { |