Fix profile wrong DISTINCT + ORDER BY

[friendica.git] / mod / videos.php

diff --git a/mod/videos.php b/mod/videos.php
index 64838998f14173e97a148d7600b6b7064845ee23..ea2e0d4a24f08ca84c0cca7d6406757e8f601812 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -6,7 +6,7 @@ require_once('include/security.php');
 require_once('include/redir.php');
 
 
-function videos_init(App &$a) {
+function videos_init(App $a) {
 
        if($a->argc > 1)
                auto_redir($a, $a->argv[1]);
@@ -102,7 +102,7 @@ function videos_init(App &$a) {
 
 
 
-function videos_post(App &$a) {
+function videos_post(App $a) {
 
        $owner_uid = $a->data['user']['uid'];
 
@@ -113,7 +113,7 @@ function videos_post(App &$a) {
        if (($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
 
                // Check if we should do HTML-based delete confirmation
-               if(!x($_REQUEST,'confirm')) {
+               if (!x($_REQUEST,'confirm')) {
                        if (x($_REQUEST,'canceled')) {
                                goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
                        }
@@ -138,7 +138,6 @@ function videos_post(App &$a) {
 
                $video_id = $_POST['id'];
 
-
                $r = q("SELECT `id`  FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1",
                        intval(local_user()),
                        dbesc($video_id)
@@ -183,7 +182,7 @@ function videos_post(App &$a) {
 
 
 
-function videos_content(App &$a) {
+function videos_content(App $a) {
 
        // URLs (most aren't currently implemented):
        // videos/name
@@ -359,7 +358,7 @@ function videos_content(App &$a) {
 
        $r = q("SELECT hash, `id`, `filename`, filetype FROM `attach`
                WHERE `uid` = %d AND filetype LIKE '%%video%%'
-               $sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d",
+               $sql_extra GROUP BY hash, `id` ORDER BY `created` DESC LIMIT %d , %d",
                intval($a->data['user']['uid']),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
@@ -409,4 +408,3 @@ function videos_content(App &$a) {
        $o .= paginate($a);
        return $o;
 }
-