diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-09-13 10:30:08 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-09-13 10:30:08 +0200 |
| commit | 29b0ed87d61ae7c5fae5a43ad667cefce3938e25 (patch) | |
| tree | d94df5802569f08b4b640a5763a2ea27b2d49743 /include | |
| parent | 87ca60b0b128bf12b611146264159377baca71a3 (diff) | |
| parent | 0e6d84e20731f173e489fe0d54b43c01266c0391 (diff) | |
| download | volse-hubzilla-29b0ed87d61ae7c5fae5a43ad667cefce3938e25.tar.gz volse-hubzilla-29b0ed87d61ae7c5fae5a43ad667cefce3938e25.tar.bz2 volse-hubzilla-29b0ed87d61ae7c5fae5a43ad667cefce3938e25.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/network.php | 2 | ||||
| -rw-r--r-- | include/text.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/network.php b/include/network.php index 96cea4b6f..da1afc3ac 100644 --- a/include/network.php +++ b/include/network.php @@ -411,7 +411,7 @@ function http_status($val, $msg = '') { if ($val >= 200 && $val < 300) $msg = (($msg) ? $msg : 'OK'); - logger('' . $val . ' ' . $msg); + logger(\App::$query_string . ':' . $val . ' ' . $msg); header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg); } diff --git a/include/text.php b/include/text.php index 51d711021..c4d441e85 100644 --- a/include/text.php +++ b/include/text.php @@ -1786,15 +1786,15 @@ function layout_select($channel_id, $current = '') { } -function mimetype_select($channel_id, $current = 'text/bbcode') { +function mimetype_select($channel_id, $current = 'text/bbcode', $choices = null, $element = 'mimetype') { - $x = array( + $x = (($choices) ? $choices : [ 'text/bbcode', 'text/html', 'text/markdown', 'text/plain', 'application/x-pdl' - ); + ]); if((App::$is_sys) || (channel_codeallowed($channel_id) && $channel_id == local_channel())){ @@ -1807,7 +1807,7 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { } $o = replace_macros(get_markup_template('field_select_raw.tpl'), array( - '$field' => array('mimetype', t('Page content type'), $selected, '', $options) + '$field' => array( $element, t('Page content type'), $selected, '', $options) )); return $o; |