[various] Remove redundant profile_uid field from profile query

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 2d07c82927eede43e6e05d3cdff08ba9126303de..5baad462c27224d36dcbffd76f895d76a8f1fe18 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -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`

diff --git a/widgets/widget_friendheader.php b/widgets/widget_friendheader.php
index f47b1b572c5e021cebdadbc5e249a3a74e392c40..c403129069f880af168b876a3c854889fc13faac 100644 (file)
--- a/widgets/widget_friendheader.php
+++ b/widgets/widget_friendheader.php
@@ -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'])

diff --git a/widgets/widget_friends.php b/widgets/widget_friends.php
index a3951cdc884387da4ce967daa2e1b09a8f886bf7..08b7415c5a3a98a2b0ef508cc53f06c4ae4794bc 100644 (file)
--- a/widgets/widget_friends.php
+++ b/widgets/widget_friends.php
@@ -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'])