[TASK] Fixed merge conflicts

jweiland-net · Oct 22, 2024 · 61a49cb · 61a49cb
2 parents 5204ad5 + 48ee51f
commit 61a49cb
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,8 +32,14 @@ nbproject
 .sass-cache
 .session
 *.log
+
 # Ignore composer stuff
 /composer.lock
+bin/*
+vendor/*
+.build
+.Build
+composer.lock
 
 # Ignore testing stuff
 /.Build

diff --git a/Classes/ViewHelpers/VideoPublicUrlViewHelper.php b/Classes/ViewHelpers/VideoPublicUrlViewHelper.php
@@ -61,7 +61,7 @@ public static function renderStatic(
         $file = $fileReference->getOriginalFile();
         $helper = self::getOnlineMediaHelper($file);
         if ($helper instanceof OnlineMediaHelperInterface) {
-            $publicUrl = $helper->getPublicUrl($file);
+            $publicUrl = $helper->getPublicUrl($file) ?? '';
         }
 
         return $publicUrl;

diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst
@@ -0,0 +1,24 @@
+..  include:: /Includes.rst.txt
+
+
+..  _changelog:
+
+=========
+ChangeLog
+=========
+
+Version 3.2.0
+=============
+
+*   [TASK] Fixed Broken badge url
+*   [TASK] Documentation ChangeLog page added
+*   [BUGFIX] Prevent TypeError when returning public
+
+Version 3.1.0
+=============
+
+*   [FEATURE] Add VH argument fallbackThumbnailFile
+*   [TASK] Remove TypoScript access from VH
+*   [BUGFIX] Prevent duplicate EXT: parsing
+*   [DOCS] Please read update instructions before updating. Maybe you have to update your templates!!!
+
diff --git a/Documentation/Index.rst b/Documentation/Index.rst
@@ -43,6 +43,7 @@ This extension provides more privacy when embedding videos in frontend.
     Installation/Index
     Configuration/Index
     Update/Index
+    ChangeLog/Index
     Links
 
 ..  Meta Menu

diff --git a/composer.json b/composer.json
@@ -15,7 +15,12 @@
 		{
 			"name": "Stefan Froemken",
 			"email": "[email protected]",
-			"role": "Developer"
+			"role": "Lead TYPO3 Developer"
+		},
+		{
+			"name": "Hoja Mustaffa Abdul Latheef",
+			"email": "[email protected]",
+			"role": "Senior TYPO3 Developer"
 		}
 	],
 	"homepage": "https://jweiland.net",

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -12,7 +12,7 @@
     'description' => 'This extension provides more privacy when embedding videos in frontend.',
     'category' => 'plugin',
     'state' => 'stable',
-    'author' => 'Stefan Froemken',
+    'author' => 'Stefan Froemken, Hoja Mustaffa Abdul Latheef',
     'author_email' => '[email protected]',
     'author_company' => 'jweiland.net',
     'version' => '4.0.0',