commit
5a0f33dca0
|
@ -426,7 +426,7 @@ function uri_to_guid($uri, $host = "") {
|
||||||
* @return array Item array with removed conversation data
|
* @return array Item array with removed conversation data
|
||||||
*/
|
*/
|
||||||
function store_conversation($arr) {
|
function store_conversation($arr) {
|
||||||
if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
|
if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)) && !empty($arr['uri'])) {
|
||||||
$conversation = array('item-uri' => $arr['uri'], 'received' => DBM::date());
|
$conversation = array('item-uri' => $arr['uri'], 'received' => DBM::date());
|
||||||
|
|
||||||
if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
|
if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
|
||||||
|
|
|
@ -138,7 +138,7 @@ class Contact extends BaseObject
|
||||||
*/
|
*/
|
||||||
public static function unmarkForArchival(array $contact)
|
public static function unmarkForArchival(array $contact)
|
||||||
{
|
{
|
||||||
$condition = array('`id` => ? AND (`term-date` > ? OR `archive`)', $contact[`id`], NULL_DATE);
|
$condition = array('`id` = ? AND (`term-date` > ? OR `archive`)', $contact[`id`], NULL_DATE);
|
||||||
$exists = dba::exists('contact', $condition);
|
$exists = dba::exists('contact', $condition);
|
||||||
|
|
||||||
// We don't need to update, we never marked this contact for archival
|
// We don't need to update, we never marked this contact for archival
|
||||||
|
@ -613,7 +613,7 @@ class Contact extends BaseObject
|
||||||
'readonly' => 0, 'pending' => 0)
|
'readonly' => 0, 'pending' => 0)
|
||||||
);
|
);
|
||||||
|
|
||||||
$s = dba::select('contact', array('id'), array('nurl' => normalise_link($data["url"]), 'uid' => $uid), array('order' => 'id', 'limit' => 2));
|
$s = dba::select('contact', array('id'), array('nurl' => normalise_link($data["url"]), 'uid' => $uid), array('order' => array('id'), 'limit' => 2));
|
||||||
$contacts = dba::inArray($s);
|
$contacts = dba::inArray($s);
|
||||||
if (!DBM::is_result($contacts)) {
|
if (!DBM::is_result($contacts)) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user