Make frio more consistent by replacing textual links with icons everywhere. (#5415)

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index de691de4ffbe84db28605ce6a69291c1feded362..07916c5871b4cf61aa0d55d81c8e4a838c434589 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -221,7 +221,7 @@ function photos_post(App $a)
                        // Update the photo albums cache
                        Photo::clearAlbumCache($page_owner_uid);
 
-                       $newurl = str_replace(bin2hex($album), bin2hex($newalbum), $_SESSION['photo_return']);
+                       $newurl = System::baseUrl() . '/photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum);
                        goaway($newurl);
                        return; // NOTREACHED
                }
@@ -1041,7 +1041,7 @@ function photos_content(App $a)
 
                $albumselect = '';
 
-               $albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
+               $albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '>&lt;current year&gt;</option>';
                if (count($a->data['albums'])) {
                        foreach ($a->data['albums'] as $album) {
                                if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos'))) {
@@ -1077,7 +1077,7 @@ function photos_content(App $a)
                        '$usage' => $usage_message,
                        '$nickname' => $a->data['user']['nickname'],
                        '$newalbum' => L10n::t('New album name: '),
-                       '$existalbumtext' => L10n::t('or existing album name: '),
+                       '$existalbumtext' => L10n::t('or select existing album:'),
                        '$nosharetext' => L10n::t('Do not show a status post for this upload'),
                        '$albumselect' => $albumselect,
                        '$permissions' => L10n::t('Permissions'),
@@ -1154,9 +1154,9 @@ function photos_content(App $a)
                }
 
                if ($order_field === 'posted') {
-                       $order =  [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)];
+                       $order =  [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest'];
                } else {
-                       $order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'];
+                       $order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted', 'newest'];
                }
 
                $photos = [];