diff --git a/.gitignore b/.gitignore index 9b11849b12..6252e3214f 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ plugin/CustomizeUser/getMyAccount.php /plugin/Search/ plugin/Vdatait/ plugin/VideoPlaylistScheduler/ +install/bulkCreateUser.php diff --git a/objects/functions.php b/objects/functions.php index 10a63db553..9e02e85cc9 100644 --- a/objects/functions.php +++ b/objects/functions.php @@ -1331,7 +1331,7 @@ function getSources($fileName, $returnArray = false, $try = 0) if ($returnArray) { $return = array_merge($videoSources, $audioTracks, $subtitleTracks, $captionsTracks); } else { - $return = $videoSources . $audioTracks . $subtitleTracks.$captionsTracks; + $return = $videoSources . $audioTracks . PHP_EOL . $subtitleTracks . PHP_EOL . $captionsTracks; } $obj = new stdClass(); diff --git a/plugin/PlayerSkins/PlayerSkins.php b/plugin/PlayerSkins/PlayerSkins.php index 69f3fc8bc8..70a22ed49f 100644 --- a/plugin/PlayerSkins/PlayerSkins.php +++ b/plugin/PlayerSkins/PlayerSkins.php @@ -145,6 +145,7 @@ class PlayerSkins extends PluginAbstract class="embed-responsive-item video-js vjs-default-skin vjs-big-play-centered vjs-16-9" id="mainVideo">'; if ($video['type'] == Video::$videoTypeVideo) { $sources = getSources($video['filename']); + //var_dump($video['filename'], $sources);exit; $htmlMediaTag .= "" . $sources; //var_dump($sources);exit; } else { // video link $url = AVideoPlugin::modifyURL($video['videoLink'], $video['id']); diff --git a/view/channelPlaylistItems.php b/view/channelPlaylistItems.php index bd4e09104a..a0265e2c4e 100644 --- a/view/channelPlaylistItems.php +++ b/view/channelPlaylistItems.php @@ -113,7 +113,7 @@ unset($_POST['current']); $startC = microtime(true); $countSuccess++; ?> - +