From c7f8f190b9f14c28fe811a2f244534027344e7cc Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 29 Aug 2018 18:28:13 +0000 Subject: [PATCH] Oh no, even more notices ... (#5697) --- mod/videos.php | 3 ++- src/Model/User.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/videos.php b/mod/videos.php index e622e17f0f..e00df10a24 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -367,11 +367,12 @@ function videos_content(App $a) foreach ($r as $rr) { $alt_e = $rr['filename']; /// @todo The album isn't part of the above query. This seems to be some unfinished code that needs to be reworked completely. + $rr['album'] = ''; $name_e = $rr['album']; $videos[] = [ 'id' => $rr['id'], - 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'], + 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'], 'title' => L10n::t('View Video'), 'src' => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0', 'alt' => $alt_e, diff --git a/src/Model/User.php b/src/Model/User.php index a43ef06f97..d65e7d8f96 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -730,7 +730,7 @@ class User DBA::insert('userd', ['username' => $user['nickname']]); // The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php) - DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc($t . " + 7 day")], ['uid' => $uid]); + DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc(DateTimeFormat::utcNow() . " + 7 day")], ['uid' => $uid]); Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid); // Send an update to the directory