diff options
| author | friendica <info@friendica.com> | 2012-07-15 21:06:07 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-15 21:06:07 -0700 |
| commit | f83a504da139faf2e1707679cde9255b458b79e3 (patch) | |
| tree | 4d017f9faf9da956b42fc9d19fd7c644708537ae /include | |
| parent | 03209d2d0dc6b0ceed2325bff598fede2c538301 (diff) | |
| download | volse-hubzilla-f83a504da139faf2e1707679cde9255b458b79e3.tar.gz volse-hubzilla-f83a504da139faf2e1707679cde9255b458b79e3.tar.bz2 volse-hubzilla-f83a504da139faf2e1707679cde9255b458b79e3.zip | |
more work on json notifications, now working except for notify popup
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/datetime.php | 2 | ||||
| -rw-r--r-- | include/socgraph.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index f348e56a2..7beff3b03 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -770,7 +770,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'text' => strip_tags(template_escape($body)), 'id' => $item['item_id'], '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'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), + 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), 'to' => t('to'), 'wall' => t('Wall-to-Wall'), 'vwall' => t('via Wall-To-Wall:'), diff --git a/include/datetime.php b/include/datetime.php index 9f145e5c7..e8ae01344 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -112,7 +112,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d } catch(Exception $e) { logger('datetime_convert: exception: ' . $e->getMessage()); - $d = newDateTime('now', $from_obj); + $d = new DateTime('now', $from_obj); } try { diff --git a/include/socgraph.php b/include/socgraph.php index eccb133cc..4fe9eaf90 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -229,7 +229,7 @@ function count_common_friends_zcid($uid,$zcid) { } -function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle) { +function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = false) { if($shuffle) $sql_extra = " order by rand() "; |