diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-13 19:26:07 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-13 19:26:07 -0700 |
| commit | e8e61c83d572b41664a1066d60f2f78ef596183e (patch) | |
| tree | d94df5802569f08b4b640a5763a2ea27b2d49743 /include | |
| parent | 20ae69ab7babe8d526de7d4c584aa5cd2f836e1f (diff) | |
| parent | 29b0ed87d61ae7c5fae5a43ad667cefce3938e25 (diff) | |
| download | volse-hubzilla-e8e61c83d572b41664a1066d60f2f78ef596183e.tar.gz volse-hubzilla-e8e61c83d572b41664a1066d60f2f78ef596183e.tar.bz2 volse-hubzilla-e8e61c83d572b41664a1066d60f2f78ef596183e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/nav.php | 6 | ||||
| -rw-r--r-- | include/network.php | 2 | ||||
| -rwxr-xr-x | include/oembed.php | 2 | ||||
| -rw-r--r-- | include/text.php | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/nav.php b/include/nav.php index f5a1236a8..01decb2bf 100644 --- a/include/nav.php +++ b/include/nav.php @@ -170,9 +170,9 @@ EOT; if(local_channel()) { - $nav['network'] = array('network', t('Grid'), "", t('Your grid'),'network_nav_btn'); - $nav['network']['all'] = [ 'network', t('View your network/grid'), '','' ]; - $nav['network']['mark'] = array('', t('Mark all grid notifications seen'), '',''); + $nav['network'] = array('network', t('Activity'), "", t('Network Activity'),'network_nav_btn'); + $nav['network']['all'] = [ 'network', t('View your network activity'), '','' ]; + $nav['network']['mark'] = array('', t('Mark all activity notifications seen'), '',''); $nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'),'home_nav_btn'); $nav['home']['all'] = [ 'channel/' . $channel['channel_address'], t('View your channel home'), '' , '' ]; 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/oembed.php b/include/oembed.php index f662d84c7..c2bf0a0ed 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -231,7 +231,7 @@ function oembed_fetch_url($embedurl){ // So if we see this, grab the frame src url and use that // as the embed content - which will still need to be purified. - if(preg_match('#<iframe(.*?)src=[\'\"](.?*)[\'\"]#',$matches,$j['html'])) { + if(preg_match('#\<iframe(.*?)src\=[\'\"](.*?)[\'\"]#',$j['html'],$matches)) { $x = z_fetch_url($matches[2]); $j['html'] = $x['body']; } 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; |