Merge remote-tracking branch 'upstream/develop' into develop

Changes in #3034 were somehow conflicting. :-(

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 94c6ccfb8d201dfa55b7e1e766ca72dece17af88..3b4832e74f579bcdd35b4cba9f2ba1f4e22fec8a 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2290,7 +2290,7 @@ class diaspora {
                                $body = "[img]".unxmlify($photo->remote_photo_path).
                                        unxmlify($photo->remote_photo_name)."[/img]\n".$body;
 
-                       $datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
+                       $datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
                } else {
                        $datarray["object-type"] = ACTIVITY_OBJ_NOTE;
 

diff --git a/include/like.php b/include/like.php
index 8223cf3626080ec9803ac0fb8f8819ffb13012da..b04b9b4e0991540366cc3e9a18f27d377357f1ab 100644 (file)
--- a/include/like.php
+++ b/include/like.php
@@ -164,7 +164,7 @@ function do_like($item_id, $verb) {
        $post_type = (($item['resource-id']) ? t('photo') : t('status'));
        if($item['object-type'] === ACTIVITY_OBJ_EVENT)
                $post_type = t('event');
-       $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+       $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
        $link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
        $body = $item['body'];
 

diff --git a/include/notifier.php b/include/notifier.php
index 9e1450ba2b5004a676f62375aab0f686290f3c23..d78db4055d9779155b3f9ca0e6eef1a78ebde574 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -576,7 +576,7 @@ function notifier_run(&$argv, &$argc){
                        $r0 = array();
 
                $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-                       AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+                       AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
                        dbesc(NETWORK_DIASPORA),
                        intval($owner['uid']),
                        intval(CONTACT_IS_SHARING)

diff --git a/mod/photos.php b/mod/photos.php
index 8d97a30051afd94aac3f60da2969201715ec7787..317d7272b41d689889e7694942e8f748488e5601 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -681,7 +681,7 @@ function photos_post(App &$a) {
                                        $arr['visible']       = 1;
                                        $arr['verb']          = ACTIVITY_TAG;
                                        $arr['object-type']   = ACTIVITY_OBJ_PERSON;
-                                       $arr['target-type']   = ACTIVITY_OBJ_PHOTO;
+                                       $arr['target-type']   = ACTIVITY_OBJ_IMAGE;
                                        $arr['tag']           = $tagged[4];
                                        $arr['inform']        = $tagged[2];
                                        $arr['origin']        = 1;
@@ -694,7 +694,7 @@ function photos_post(App &$a) {
                                                $arr['object'] .= xmlify('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
                                        $arr['object'] .= '</link></object>' . "\n";
 
-                                       $arr['target'] = '<target><type>' . ACTIVITY_OBJ_PHOTO . '</type><title>' . $p[0]['desc'] . '</title><id>'
+                                       $arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>'
                                                . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
                                        $arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . App::get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
 

diff --git a/mod/subthread.php b/mod/subthread.php
index 3d16f8ca9ca4d3a7c12caea768af322ae505ecad..958f4ba03b65bd831689d9cb4e1fba9bfd7c76b9 100644 (file)
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -86,7 +86,7 @@ function subthread_content(App &$a) {
        $uri = item_new_uri($a->get_hostname(),$owner_uid);
 
        $post_type = (($item['resource-id']) ? t('photo') : t('status'));
-       $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+       $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
        $link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
        $body = $item['body'];
 

diff --git a/mod/tagger.php b/mod/tagger.php
index 4d93047e260ac6098fb2e9cdc87e2d54b0068f03..b1f91d1bc403c3b78e1a6b11cde6baa02c7e81e2 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -60,7 +60,7 @@ function tagger_content(App &$a) {
        $uri = item_new_uri($a->get_hostname(),$owner_uid);
        $xterm = xmlify($term);
        $post_type = (($item['resource-id']) ? t('photo') : t('status'));
-       $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+       $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 
        $link = xmlify('<link rel="alternate" type="text/html" href="'
                . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;