X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=681b1dbd1cdd45974b9ee00b16ccf83dbcb9c544;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=b02570d5afcca60960a6f25726225c052bd50167;hpb=db949bb802448184bfe5164d8d3dd86ddf51b187;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index b02570d5af..681b1dbd1c 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -3,7 +3,7 @@
require_once('include/contact_widgets.php');
require_once('include/redir.php');
-if(! function_exists('profile_init')) {
+
function profile_init(&$a) {
if(! x($a->page,'aside'))
@@ -65,10 +65,10 @@ function profile_init(&$a) {
foreach($dfrn_pages as $dfrn)
$a->page['htmlhead'] .= "get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
$a->page['htmlhead'] .= "get_baseurl()."/poco/{$which}\" />\r\n";
-}
+
}
-if(! function_exists('profile_content')) {
+
function profile_content(&$a, $update = 0) {
$category = $datequery = $datequery2 = '';
@@ -216,8 +216,7 @@ function profile_content(&$a, $update = 0) {
if($update) {
- $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`,
- `contact`.`uid` AS `contact-uid`
+ $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
@@ -282,9 +281,8 @@ function profile_content(&$a, $update = 0) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
- $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`,
- `thread`.`uid` AS `contact-uid`
- FROM `thread` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+ $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`
+ FROM `thread` FORCE INDEX (`uid_created`) INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
$sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0
@@ -300,21 +298,13 @@ function profile_content(&$a, $update = 0) {
$parents_arr = array();
$parents_str = '';
- if(count($r)) {
+ if (dbm::is_result($r)) {
foreach($r as $rr)
$parents_arr[] = $rr['item_id'];
$parents_str = implode(', ', $parents_arr);
- $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
- `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
- `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
- FROM `item`, `contact`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- and `item`.`moderated` = 0
- AND `contact`.`id` = `item`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`parent` IN ( %s )
+ $items = q(item_query()." AND `item`.`uid` = %d
+ AND `item`.`parent` IN (%s)
$sql_extra ",
intval($a->profile['profile_uid']),
dbesc($parents_str)
@@ -350,4 +340,3 @@ function profile_content(&$a, $update = 0) {
return $o;
}
-}