Merge pull request #12920 from annando/issue-12701

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 50780724ff5c52058d0e3811ec55f200962aa997..18db9c15d997e8433ddd6d62552cdb56cc73e5ae 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -62,7 +62,7 @@ function photos_init(App $a)
        Nav::setSelected('home');
 
        if (DI::args()->getArgc() > 1) {
-               $owner = User::getOwnerDataByNick(DI::args()->getArgv()[1]);
+               $owner = Profile::load(DI::app(), DI::args()->getArgv()[1], false);
                if (!isset($owner['account_removed']) || $owner['account_removed']) {
                        throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
                }
@@ -111,12 +111,6 @@ function photos_init(App $a)
                        ]);
                }
 
-               if (empty(DI::page()['aside'])) {
-                       DI::page()['aside'] = '';
-               }
-
-               DI::page()['aside'] .= Widget\VCard::getHTML($owner);
-
                if (!empty($photo_albums_widget)) {
                        DI::page()['aside'] .= $photo_albums_widget;
                }
@@ -1145,7 +1139,7 @@ function photos_content(App $a)
                                                '$preview' => DI::l10n()->t('Preview'),
                                                '$loading' => DI::l10n()->t('Loading...'),
                                                '$qcomment' => $qcomment,
-                                               '$rand_num' => Crypto::randomDigits(12)
+                                               '$rand_num' => Crypto::randomDigits(12),
                                        ]);
                                }
                        }
@@ -1200,7 +1194,7 @@ function photos_content(App $a)
                                                '$submit' => DI::l10n()->t('Submit'),
                                                '$preview' => DI::l10n()->t('Preview'),
                                                '$qcomment' => $qcomment,
-                                               '$rand_num' => Crypto::randomDigits(12)
+                                               '$rand_num' => Crypto::randomDigits(12),
                                        ]);
                                }
 
@@ -1274,7 +1268,7 @@ function photos_content(App $a)
                                                        '$submit' => DI::l10n()->t('Submit'),
                                                        '$preview' => DI::l10n()->t('Preview'),
                                                        '$qcomment' => $qcomment,
-                                                       '$rand_num' => Crypto::randomDigits(12)
+                                                       '$rand_num' => Crypto::randomDigits(12),
                                                ]);
                                        }
                                }