From eccc337d44c4c11ce22599286f32fb36430fa6ba Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 13 Feb 2025 22:08:25 +0900
Subject: [PATCH] Remove ogv from list of directly playable video formats #2469

---
 common/framework/filters/FilenameFilter.php    | 4 ++--
 common/js/plugins/jquery.fileupload/js/main.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/framework/filters/FilenameFilter.php b/common/framework/filters/FilenameFilter.php
index 228f9227c..602b73354 100644
--- a/common/framework/filters/FilenameFilter.php
+++ b/common/framework/filters/FilenameFilter.php
@@ -101,8 +101,8 @@ class FilenameFilter
 	{
 		$images = 'gif|jpe?g|jfif|png|webp';
 		$audios = 'mp3|wav|ogg|flac|aac';
-		$videos = 'mp4|webm|ogv';
-		$legacy = 'avi|as[fx]|flv|m4[av]|midi?|mkv|moo?v|mpe?g|qt|r[am]m?|wm[av]';
+		$videos = 'mp4|webm';
+		$legacy = 'avi|as[fx]|flv|m4[av]|midi?|mkv|moo?v|mpe?g|qt|r[am]m?|wm[av]|ogv';
 
 		if ($include_multimedia)
 		{
diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js
index 8acdb7b53..cb52a126c 100644
--- a/common/js/plugins/jquery.fileupload/js/main.js
+++ b/common/js/plugins/jquery.fileupload/js/main.js
@@ -181,7 +181,7 @@
 						else if (filename.match(/\.(mp3|wav|ogg|flac|aac)$/i) && opt.autoinsertTypes.audio) {
 							temp_code = self.generateHtml($container, result);
 						}
-						else if (filename.match(/\.(mp4|webm|ogv)$/i) && opt.autoinsertTypes.video) {
+						else if (filename.match(/\.(mp4|webm)$/i) && opt.autoinsertTypes.video) {
 							temp_code = self.generateHtml($container, result);
 						}
 
@@ -365,7 +365,7 @@
 				html = '<audio src="' + file.download_url + '" controls' +
 					' data-file-srl="' + file.file_srl + '" />';
 			}
-			else if (filename.match(/\.(mp4|webm|ogv)$/i)) {
+			else if (filename.match(/\.(mp4|webm)$/i)) {
 				if (file.original_type === 'image/gif') {
 					html = '<video src="' + file.download_url + '"'
 						+ ' autoplay loop muted playsinline data-file-srl="' + file.file_srl + '" />';
@@ -519,7 +519,7 @@
 
 					if(file.thumbnail_filename) {
 						file.thumbnail_url = file.thumbnail_filename;
-						if(/\.(mp4|webm|ogv)$/i.test(file.source_filename)) {
+						if(/\.(mp4|webm)$/i.test(file.source_filename)) {
 							result_image.push(template_fileimte_video(file));
 						} else {
 							result_image.push(template_fileimte_image(file));