mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-11-05 17:42:54 +00:00
Merge pull request #957 from MrPetovan/task/4090-move-profile_photo-to-src
[various] Remove redundant profile_uid field from profile query
This commit is contained in:
commit
86b2d830a5
3 changed files with 3 additions and 3 deletions
|
@ -105,7 +105,7 @@ function forumdirectory_content(App $a)
|
||||||
|
|
||||||
$limit = $pager->getStart()."," . $pager->getItemsPerPage();
|
$limit = $pager->getStart()."," . $pager->getItemsPerPage();
|
||||||
|
|
||||||
$r = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
|
$r = DBA::p("SELECT `profile`.*, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
|
||||||
`contact`.`addr`, `contact`.`url` AS `profile_url` FROM `profile`
|
`contact`.`addr`, `contact`.`url` AS `profile_url` FROM `profile`
|
||||||
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||||
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
|
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
|
||||||
|
|
|
@ -25,7 +25,7 @@ function friendheader_widget_size()
|
||||||
|
|
||||||
function friendheader_widget_content(&$a, $conf)
|
function friendheader_widget_content(&$a, $conf)
|
||||||
{
|
{
|
||||||
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
|
$r = q("SELECT `profile`.* , `user`.* FROM `profile`
|
||||||
LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
|
LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
|
||||||
WHERE `user`.`uid` = %s LIMIT 1",
|
WHERE `user`.`uid` = %s LIMIT 1",
|
||||||
intval($conf['uid'])
|
intval($conf['uid'])
|
||||||
|
|
|
@ -27,7 +27,7 @@ function friends_widget_size()
|
||||||
|
|
||||||
function friends_widget_content(&$a, $conf)
|
function friends_widget_content(&$a, $conf)
|
||||||
{
|
{
|
||||||
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
|
$r = q("SELECT `profile`.* , `user`.* FROM `profile`
|
||||||
LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
|
LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
|
||||||
WHERE `user`.`uid` = %s LIMIT 1",
|
WHERE `user`.`uid` = %s LIMIT 1",
|
||||||
intval($conf['uid'])
|
intval($conf['uid'])
|
||||||
|
|
Loading…
Reference in a new issue