diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/plugin.php | 4 | ||||
| -rw-r--r-- | include/text.php | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index a8e89d194..46621a243 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1491,7 +1491,7 @@ function hz_status_editor($a, $x, $popup = false) { '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), '$post_id' => ((x($x, 'post_id')) ? $x['post_id'] : ''), '$defloc' => $x['default_location'] ?? '', - '$visitor' => $x['visitor'], + '$visitor' => $x['visitor'] ?? '', '$lockstate' => $x['lockstate'] ?? '', '$acl' => $x['acl'] ?? '', '$allow_cid' => acl2json($x['permissions']['allow_cid']), diff --git a/include/plugin.php b/include/plugin.php index a17f5761d..ff5014c8b 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -851,6 +851,10 @@ function get_template_info($template){ foreach( $ll as $l ) { $l = trim($l, "\t\n\r */"); if ($l != ""){ + if (strpos($l, ':') === false) { + continue; + } + list($k, $v) = array_map("trim", explode(":", $l, 2)); $k = strtolower($k); if ($k == 'author' || $k == 'maintainer'){ diff --git a/include/text.php b/include/text.php index d0092912b..2bcbdd1c0 100644 --- a/include/text.php +++ b/include/text.php @@ -2174,6 +2174,9 @@ function layout_select($channel_id, $current = '') { intval(ITEM_TYPE_PDL) ); + $selected = ''; + $options = ''; + if($r) { $empty_selected = (($current === false) ? ' selected="selected" ' : ''); $options .= '<option value="" ' . $empty_selected . '>' . t('default') . '</option>'; @@ -2206,6 +2209,7 @@ function mimetype_select($channel_id, $current = 'text/bbcode', $choices = null, $x['application/x-php'] = t('PHP'); } + $selected = ''; $options = ''; foreach($x as $y => $z) { |