From: Michael <heluecht@pirati.ca>
Date: Sun, 12 Mar 2017 20:54:28 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1702-null-date
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1624150db4d0f511d7d119eb645e997bd3f76129;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1702-null-date

Conflicts:
	include/onepoll.php
---

1624150db4d0f511d7d119eb645e997bd3f76129
diff --cc include/onepoll.php
index 90ca639dd1,552fea36fa..bfb904fb60
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@@ -248,18 -265,16 +265,16 @@@ function onepoll_run(&$argv, &$argc)
  				intval($contact['id'])
  			);
  			mark_for_death($contact);
- 		}
- 		else {
- 			if ($contact['term-date'] > NULL_DATE) {
- 				logger("poller: $url back from the dead - removing mark for death");
- 				unmark_for_death($contact);
- 			}
 -		} elseif ($contact['term-date'] != '0000-00-00 00:00:00') {
++		} elseif ($contact['term-date'] > NULL_DATE) {
+ 			logger("poller: $url back from the dead - removing mark for death");
+ 			unmark_for_death($contact);
  		}
  
- 		if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+ 		if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
  			return;
+ 		}
  
- 		if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
+ 		if (((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
  			q("update contact set poco = '%s' where id = %d",
  				dbesc(str_replace('/profile/','/poco/', $contact['url'])),
  				intval($contact['id'])
diff --cc include/socgraph.php
index b5fc5aa659,01d2cff019..152f713c10
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@@ -690,9 -690,9 +690,9 @@@ function poco_check_server($server_url
  		return false;
  
  	$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
- 	if ($servers) {
+ 	if (dbm::is_result($servers)) {
  
 -		if ($servers[0]["created"] == "0000-00-00 00:00:00")
 +		if ($servers[0]["created"] <= NULL_DATE)
  			q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
  				dbesc(datetime_convert()), dbesc(normalise_link($server_url)));