aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-11-13 19:32:59 -0800
committerfriendica <info@friendica.com>2012-11-13 19:32:59 -0800
commitaa88165383b14c35114549334567f362e9c83e54 (patch)
tree4f5eae97b6c1df5eab3a0b6ff198c539981839c0 /include/text.php
parent4af6d77de3e282002682c28b2709b217b4ae9306 (diff)
downloadvolse-hubzilla-aa88165383b14c35114549334567f362e9c83e54.tar.gz
volse-hubzilla-aa88165383b14c35114549334567f362e9c83e54.tar.bz2
volse-hubzilla-aa88165383b14c35114549334567f362e9c83e54.zip
mood mostly working
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/text.php b/include/text.php
index ee7595c01..4458cdaa4 100644
--- a/include/text.php
+++ b/include/text.php
@@ -364,7 +364,7 @@ function item_message_id() {
$dups = false;
$hash = random_string();
- $uri = $hash . '@' . $hostname;
+ $uri = $hash . '@' . get_app()->get_hostname();
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($uri));
@@ -527,8 +527,8 @@ function contact_block() {
$o = '';
$a = get_app();
-logger('contact block');
$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');
+
if($shown === false)
$shown = 24;
if($shown == 0)
@@ -1730,11 +1730,11 @@ function find_xchan_in_array($xchan,$arr) {
return array();
}
-function get_json_rel_link($j,$rel) {
+function get_rel_link($j,$rel) {
if(count($j))
foreach($j as $l)
- if($l->rel === $rel)
- return $l->href;
+ if($l['rel'] === $rel)
+ return $l['href'];
return '';
}