Let the cronhook be called different from the cron job.

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index eac4697f91d4d3accde56748862de286fc856434..8d364e6023040e8d0ed00b0ad6e31fce33a8d1cd 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -4,6 +4,7 @@ if(class_exists('Item'))
 
 require_once('object/BaseObject.php');
 require_once('include/text.php');
+require_once('include/diaspora.php');
 require_once('boot.php');
 
 /**
@@ -154,7 +155,7 @@ class Item extends BaseObject {
 
                $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
                call_hooks('render_location',$locate);
-               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
                $searchpath = $a->get_baseurl()."/search?tag=";
                $tags=array();
@@ -300,14 +301,13 @@ class Item extends BaseObject {
 
                // Diaspora isn't able to do likes on comments - but red does
                if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND
-                       !strstr($item["owner-link"], "/channel/") AND isset($buttons["like"]))
+                       !diaspora_is_redmatrix($item["owner-link"]) AND isset($buttons["like"]))
                        unset($buttons["like"]);
 
                // Facebook can like comments - but it isn't programmed in the connector yet.
                if (($item["item_network"] == NETWORK_FACEBOOK) AND ($indent == 'comment') AND isset($buttons["like"]))
                        unset($buttons["like"]);
 
-
                $tmp_item = array(
                        'template' => $this->get_template(),
 
@@ -324,7 +324,7 @@ class Item extends BaseObject {
                        'body' => $body_e,
                        'text' => $text_e,
                        'id' => $this->get_id(),
-                       'guid' => $item['guid'],
+                       'guid' => urlencode($item['guid']),
                        'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
                        'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
                        'to' => t('to'),
@@ -368,7 +368,7 @@ class Item extends BaseObject {
                         'postopts' => $langstr,
                         'edited' => $edited,
                        'network' => $item["item_network"],
-                       'network_name' => network_to_name($item['item_network']),
+                       'network_name' => network_to_name($item['item_network'], $profile_link),
                );
 
                $arr = array('item' => $item, 'output' => $tmp_item);