Merge pull request #957 from MrPetovan/task/4090-move-profile_photo-to-src

[various] Remove redundant profile_uid field from profile query
pull/966/head
Michael Vogel 2020-02-23 14:33:10 +01:00 committed by GitHub
commit 86b2d830a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -105,7 +105,7 @@ function forumdirectory_content(App $a)
$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`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`

View File

@ -25,7 +25,7 @@ function friendheader_widget_size()
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`
WHERE `user`.`uid` = %s LIMIT 1",
intval($conf['uid'])

View File

@ -27,7 +27,7 @@ function friends_widget_size()
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`
WHERE `user`.`uid` = %s LIMIT 1",
intval($conf['uid'])