diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/channel.php | 6 | ||||
| -rw-r--r-- | include/conversation.php | 7 | ||||
| -rw-r--r-- | include/items.php | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/include/channel.php b/include/channel.php index a42315ed6..296615524 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1581,6 +1581,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $details = $location = false; $pdesc = true; $reddress = true; + $connect_url = ''; + $connect = ''; if(! perm_is_allowed($profile['uid'], $observer_hash, 'view_profile')) { $block = true; @@ -1792,7 +1794,7 @@ function advanced_profile() { $profile['birthday'] = array( t('Birthday:'), $val); } - if($age = age(App::$profile['dob'],App::$profile['timezone'],'')) + if($age = age(App::$profile['dob'], App::$profile['timezone'] ?? '','')) $profile['age'] = array( t('Age:'), $age ); if(App::$profile['marital']) @@ -1874,7 +1876,7 @@ function advanced_profile() { return replace_macros($tpl, array( '$title' => t('Profile'), - '$canlike' => (($profile['canlike'])? true : false), + '$canlike' => ((isset($profile['canlike']) && $profile['canlike'])? true : false), '$likethis' => t('Like this thing'), '$export' => t('Export'), '$exportlink' => $exportlink, diff --git a/include/conversation.php b/include/conversation.php index bb0603eca..a8e89d194 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -643,10 +643,9 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $channel = App::get_channel(); $observer = App::get_observer(); - if($update) - $return_url = $_SESSION['return_url']; - else - $return_url = $_SESSION['return_url'] = App::$query_string; + if (!$update) { + $_SESSION['return_url'] = App::$query_string; + } load_contact_links(local_channel()); diff --git a/include/items.php b/include/items.php index a01a0e2fa..46140b699 100644 --- a/include/items.php +++ b/include/items.php @@ -2108,8 +2108,8 @@ function item_store_update($arr, $allow_exec = false, $deliver = true) { // apply the input filter here - $arr['summary'] = trim(z_input_filter($arr['summary'],$arr['mimetype'],$allow_exec)); - $arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec)); + $arr['summary'] = ((isset($arr['summary'])) ? trim(z_input_filter($arr['summary'],$arr['mimetype'],$allow_exec)) : ''); + $arr['body'] = ((isset($arr['body'])) ? trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec)) : ''); item_sign($arr); |