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

set_baseurl issue, more cleanup

Browse Source
This commit is contained in:
friendica
2012-12-19 16:48:17 -08:00
parent 44e70bdca3
commit 893ba371a9
6 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mod/ping.php
View File

@@ -180,24 +180,15 @@ function ping_init(&$a) {
$t2 = dba_timer();
$intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`,
`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
$intr = q("select count(abook_id) as total from abook where (abook_flags & %d) and abook_channel = %d",
intval(ABOOK_FLAG_PENDING),
intval(local_user())
);
$t3 = dba_timer();
$intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`,
`contact`.`name`, `contact`.`url`, `contact`.`photo`
FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
intval(local_user())
);
$intros = count($intros1) + count($intros2);
$result['intros'] = intval($intros);
if($intr)
$result['intros'] = intval($intr[0]['total']);
$t4 = dba_timer();
$channel = get_app()->get_channel();