diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-24 15:01:59 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-24 15:01:59 -0700 |
| commit | e01873b4cf3c217f7ee0baafbee1ba9dd42e0408 (patch) | |
| tree | 21aacbacaf2b3d41a0fb06ce725444b49cdd8fad /include | |
| parent | 268307b5346674159ef8f6d3fbfadaf41a7443f0 (diff) | |
| parent | fcaa980a3f8c0c8a98ba6912826b694371cdd26a (diff) | |
| download | volse-hubzilla-e01873b4cf3c217f7ee0baafbee1ba9dd42e0408.tar.gz volse-hubzilla-e01873b4cf3c217f7ee0baafbee1ba9dd42e0408.tar.bz2 volse-hubzilla-e01873b4cf3c217f7ee0baafbee1ba9dd42e0408.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/comanche.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/comanche.php b/include/comanche.php index e0d3af985..c1a98ed6c 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -155,7 +155,7 @@ function comanche_block($s) { dbesc($name) ); if($r) { - $o .= (($var['wrap'] == 'none') ? '' : '<div class="bblock">'); + $o .= (($var['wrap'] == 'none') ? '' : '<div class="bblock widget">'); if($r[0]['title']) $o .= '<h3>' . $r[0]['title'] . '</h3>'; diff --git a/include/conversation.php b/include/conversation.php index 19c5bda14..42ce140a6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1200,6 +1200,7 @@ function status_editor($a, $x, $popup = false) { '$shortnoloc' => t('clear location'), '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$placeholdertitle' => t('Title (optional)'), + '$hidetitle' => ((x($x, 'hidetitle')) ? $x['hidetitle'] : false), '$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''), '$category' => "", '$placeholdercategory' => t('Categories (optional, comma-separated list)'), |