harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on json notifications, now working except for notify popup

Browse Source
This commit is contained in:
friendica
2012-07-15 21:06:07 -07:00
parent 03209d2d0d
commit f83a504da1
6 changed files with 90 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@@ -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:'),

2
include/datetime.php
View File

@@ -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 {

2
include/socgraph.php
View File

@@ -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() ";