Merge branch 'release-1.1.3'

Rudloff · Jun 4, 2018 · 67283f5 · 67283f5
2 parents f046171 + f0f9ef3
commit 67283f5
Show file tree

Hide file tree

Showing 15 changed files with 470 additions and 330 deletions.
diff --git a/classes/LocaleManager.php b/classes/LocaleManager.php
@@ -93,7 +93,7 @@ public function getLocale()
     public function setLocale(Locale $locale)
     {
         putenv('LANG='.$locale);
-        setlocale(LC_ALL, [$locale, $locale.'.utf8']);
+        setlocale(LC_ALL, [$locale.'.utf8', $locale]);
         $this->curLocale = $locale;
         $this->sessionSegment->set('locale', $locale);
     }

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "phpunit/phpunit": "~6.5.2",
     "doctrine/instantiator": "~1.0.0",
     "ffmpeg/ffmpeg": "4.0",
-    "rg3/youtube-dl": "2018.05.01",
+    "rg3/youtube-dl": "2018.06.02",
     "heroku/heroku-buildpack-php": "*",
     "anam/phantomjs-linux-x86-binary": "~2.1.1"
   },
@@ -39,10 +39,10 @@
       "type": "package",
       "package": {
         "name": "rg3/youtube-dl",
-        "version": "2018.05.01",
+        "version": "2018.06.02",
         "dist": {
           "type": "zip",
-          "url": "https://github.com/rg3/youtube-dl/archive/2018.05.01.zip"
+          "url": "https://github.com/rg3/youtube-dl/archive/2018.06.02.zip"
         }
       }
     },

diff --git a/composer.lock b/composer.lock
diff --git a/controllers/FrontController.php b/controllers/FrontController.php
@@ -97,7 +97,9 @@ public function __construct(ContainerInterface $container, Config $config = null
         $session_factory = new SessionFactory();
         $session = $session_factory->newInstance($cookies);
         $this->sessionSegment = $session->getSegment(self::class);
-        if ($this->config->stream) {
+        if ($this->config->remux) {
+            $this->defaultFormat = 'bestvideo+bestaudio';
+        } elseif ($this->config->stream) {
             $this->defaultFormat = 'best';
         }
     }
@@ -466,7 +468,7 @@ private function getRedirectResponse($url, $format, Response $response, Request
         } catch (EmptyUrlException $e) {
             /*
             If this happens it is probably a playlist
-            so it will either be handle by getStream() or throw an exception anyway.
+            so it will either be handled by getStream() or throw an exception anyway.
              */
             $videoUrls = [];
         }