Differentiate between no description or an empty description

diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php
index e53ca35b86c404be83e616371cd3d1d7e8c25a71..25f9af9bc0a83d0fa9bbfd72066298efe8b06650 100644 (file)
--- a/src/Module/Media/Photo/Upload.php
+++ b/src/Module/Media/Photo/Upload.php
@@ -179,7 +179,7 @@ class Upload extends \Friendica\BaseModule
                }
 
                $this->logger->info('upload done');
-               $this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()) . "\n\n");
+               $this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt(), '') . "\n\n");
        }
 
        /**

diff --git a/src/Util/Images.php b/src/Util/Images.php
index 269dbda1998c11ed9d4b12cfc19892e7d0a094c7..7f6d8720ff0bb5f89942670da2546abbfd131671 100644 (file)
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -327,7 +327,7 @@ class Images
         * @param string $description
         * @return string
         */
-       public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = ''): string
+       public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = null): string
        {
                return self::getBBCodeByUrl(
                        DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id,
@@ -347,8 +347,17 @@ class Images
        public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = null): string
        {
                if (!empty($preview)) {
-                       return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]';
+                       if (!is_null($description)) {
+                               return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]';
+                       } else {
+                               return '[url=' . $photo . '][img]' . $preview . '[/img][/url]';
+                       }
+               }
+
+               if (!is_null($description)) {
+                       return '[img=' . $photo . ']' . $description . '[/img]';
+               } else {
+                       return '[img]' . $photo . '[/img]';
                }
-               return '[img=' . $photo . ']' . $description . '[/img]';
        }
 }