mirror of
https://github.com/friendica/friendica
synced 2024-11-18 17:03:41 +00:00
Use local_user instead
This commit is contained in:
parent
8329705eba
commit
5bcb9daa43
1 changed files with 4 additions and 4 deletions
|
@ -456,8 +456,8 @@ function networkFlatView(App $a, $update = 0)
|
||||||
$items = q("SELECT %s FROM `item` $sql_post_table %s
|
$items = q("SELECT %s FROM `item` $sql_post_table %s
|
||||||
WHERE %s AND `item`.`uid` = %d
|
WHERE %s AND `item`.`uid` = %d
|
||||||
ORDER BY `item`.`id` DESC $pager_sql ",
|
ORDER BY `item`.`id` DESC $pager_sql ",
|
||||||
item_fieldlists(), item_joins($_SESSION['uid']), item_condition(),
|
item_fieldlists(), item_joins(local_user()), item_condition(),
|
||||||
intval($_SESSION['uid'])
|
intval(local_user())
|
||||||
);
|
);
|
||||||
|
|
||||||
$condition = ['unseen' => true, 'uid' => local_user()];
|
$condition = ['unseen' => true, 'uid' => local_user()];
|
||||||
|
@ -610,7 +610,7 @@ function networkThreadedView(App $a, $update, $parent)
|
||||||
$sql_tag_nets = (($nets) ? sprintf(" AND `item`.`network` = '%s' ", dbesc($nets)) : '');
|
$sql_tag_nets = (($nets) ? sprintf(" AND `item`.`network` = '%s' ", dbesc($nets)) : '');
|
||||||
|
|
||||||
if ($gid) {
|
if ($gid) {
|
||||||
$group = dba::selectFirst('group', ['name'], ['id' => $gid, 'uid' => $_SESSION['uid']]);
|
$group = dba::selectFirst('group', ['name'], ['id' => $gid, 'uid' => local_user()]);
|
||||||
if (!DBM::is_result($group)) {
|
if (!DBM::is_result($group)) {
|
||||||
if ($update) {
|
if ($update) {
|
||||||
killme();
|
killme();
|
||||||
|
@ -626,7 +626,7 @@ function networkThreadedView(App $a, $update, $parent)
|
||||||
$contact_str_self = '';
|
$contact_str_self = '';
|
||||||
|
|
||||||
$contact_str = implode(',', $contacts);
|
$contact_str = implode(',', $contacts);
|
||||||
$self = dba::selectFirst('contact', ['id'], ['uid' => $_SESSION['uid'], 'self' => true]);
|
$self = dba::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
|
||||||
if (DBM::is_result($self)) {
|
if (DBM::is_result($self)) {
|
||||||
$contact_str_self = $self['id'];
|
$contact_str_self = $self['id'];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue