friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Some more unneeded changes reverted

This commit is contained in:
Michael 2017-03-18 08:54:25 +00:00
parent a2a171af06
commit 62ccb4499a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Contact.php
View File

@ -254,7 +254,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
// "bd" always contains the upcoming birthday of a contact. // "bd" always contains the upcoming birthday of a contact.
// "birthday" might contain the birthday including the year of birth. // "birthday" might contain the birthday including the year of birth.
if ($profile["birthday"] >= "0001-01-01") { if ($profile["birthday"] != "0000-00-00") {
$bd_timestamp = strtotime($profile["birthday"]); $bd_timestamp = strtotime($profile["birthday"]);
$month = date("m", $bd_timestamp); $month = date("m", $bd_timestamp);
$day = date("d", $bd_timestamp); $day = date("d", $bd_timestamp);
@ -271,7 +271,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
$profile["bd"] = (++$current_year)."-".$month."-".$day; $profile["bd"] = (++$current_year)."-".$month."-".$day;
} }
} else { } else {
$profile["bd"] = "0001-01-01"; $profile["bd"] = "0000-00-00";
} }
} else { } else {
$profile = $default; $profile = $default;
@ -307,7 +307,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
$profile["location"] = ""; $profile["location"] = "";
$profile["about"] = ""; $profile["about"] = "";
$profile["gender"] = ""; $profile["gender"] = "";
$profile["birthday"] = "0001-01-01"; $profile["birthday"] = "0000-00-00";
} }
$cache[$url][$uid] = $profile; $cache[$url][$uid] = $profile;

2
mod/hovercard.php
View File

@ -75,7 +75,7 @@ function hovercard_content() {
'tags' => $contact["keywords"], 'tags' => $contact["keywords"],
// 'nsfw' => intval($contact["nsfw"]), // 'nsfw' => intval($contact["nsfw"]),
// 'server_url' => $contact["server_url"], // 'server_url' => $contact["server_url"],
'bd' => (($contact["birthday"] <= "0001-01-01") ? "" : $contact["birthday"]), 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]),
// 'generation' => $contact["generation"], // 'generation' => $contact["generation"],
'account_type' => account_type($contact), 'account_type' => account_type($contact),
'actions' => $actions, 'actions' => $actions,