diff --git a/boot.php b/boot.php index e403dfc8e..b159ef073 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1097' ); +define ( 'FRIENDIKA_VERSION', '2.2.1098' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1087 ); @@ -1013,7 +1013,7 @@ function get_birthdays() { $now = strtotime('now'); $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); - $o .= '
' . $rr['name'] . ' ' . day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '') . '
' ; diff --git a/include/Contact.php b/include/Contact.php index 7524c0cea..45920041e 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -133,7 +133,12 @@ function contact_photo_menu($contact) { $o = ""; foreach($menu as $k=>$v){ - if ($v!="") $o .= "
  • $k
  • \n"; + if ($v!="") { + if(($k !== t("View recent")) && ($k !== t("Send PM"))) + $o .= "
  • $k
  • \n"; + else + $o .= "
  • $k
  • \n"; + } } return $o; }} diff --git a/include/text.php b/include/text.php index e3d984a1f..536c998de 100644 --- a/include/text.php +++ b/include/text.php @@ -571,11 +571,13 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $url = $contact['url']; $sparkle = ''; + $redir = false; if($redirect) { $a = get_app(); $redirect_url = $a->get_baseurl() . '/redir/' . $contact['id']; if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === 'dfrn')) { + $redir = true; $url = $redirect_url; $sparkle = ' sparkle'; } @@ -586,6 +588,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($textmode) { return '
    '. $contact['name'] . '
    ' . "\r\n"; @@ -593,6 +596,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { else { return '
    ' . $contact['name'] 
 			. '
    ' . "\r\n"; diff --git a/view/search_item.tpl b/view/search_item.tpl index 72246e68c..e045fc328 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -4,7 +4,7 @@
    - + $name menu
    @@ -20,7 +20,7 @@
    - $name + $name
    $ago
    diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 1c5e82b17..3db3b1507 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -4,7 +4,7 @@
    - + $name menu @@ -21,7 +21,7 @@
    - $name + $name
    $ago
    diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index fd686f0f4..cac036d06 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -2,14 +2,14 @@
    $wall
    - + $name menu
    @@ -26,7 +26,7 @@
    - $name $to $owner_name $vwall
    + $name $to $owner_name $vwall
    $ago