X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=952ab1452c938d09dc40d60527b2caebc35d2dea;hb=a98d3213767392dcce399188f65b5f976caf98e6;hp=81284d6b91ef27d654d9c078d2333ab295b41176;hpb=f6167b4cfd36ca4d7a44d501509627ca8989f6b1;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 81284d6b91..952ab1452c 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -38,7 +38,7 @@ use Friendica\Util\Strings;
  */
 function fbrowser_content(App $a)
 {
-	if (!local_user()) {
+	if (!DI::userSession()->getLocalUserId()) {
 		System::exit();
 	}
 
@@ -47,7 +47,7 @@ function fbrowser_content(App $a)
 	}
 
 	// Needed to match the correct template in a module that uses a different theme than the user/site/default
-	$theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? null);
+	$theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? '');
 	if ($theme && is_file("view/theme/$theme/config.php")) {
 		$a->setCurrentTheme($theme);
 	}
@@ -65,7 +65,7 @@ function fbrowser_content(App $a)
 
 			if (DI::args()->getArgc() == 2) {
 				$photos = DBA::toArray(DBA::p("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = ? AND NOT `photo-type` IN (?, ?)",
-					local_user(),
+					DI::userSession()->getLocalUserId(),
 					Photo::CONTACT_AVATAR,
 					Photo::CONTACT_BANNER
 				));
@@ -84,7 +84,7 @@ function fbrowser_content(App $a)
 					min(`scale`) AS `hiq`, max(`scale`) AS `loq`, ANY_VALUE(`desc`) AS `desc`, ANY_VALUE(`created`) AS `created`
 					FROM `photo` WHERE `uid` = ? $sql_extra AND NOT `photo-type` IN (?, ?)
 					GROUP BY `resource-id` $sql_extra2",
-				local_user(),
+				DI::userSession()->getLocalUserId(),
 				Photo::CONTACT_AVATAR,
 				Photo::CONTACT_BANNER
 			));
@@ -103,7 +103,8 @@ function fbrowser_content(App $a)
 				return [
 					DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
 					$filename_e,
-					DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
+					DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext,
+					$rr['desc']
 				];
 			}
 			$files = array_map("_map_files1", $r);
@@ -123,7 +124,7 @@ function fbrowser_content(App $a)
 			break;
 		case "file":
 			if (DI::args()->getArgc()==2) {
-				$files = DBA::selectToArray('attach', ['id', 'filename', 'filetype'], ['uid' => local_user()]);
+				$files = DBA::selectToArray('attach', ['id', 'filename', 'filetype'], ['uid' => DI::userSession()->getLocalUserId()]);
 
 				function _map_files2($rr)
 				{