genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/hukoeth/alltube into feature/playlist

Browse source 
Conflicts:
	templates/video.tpl
This commit is contained in:
Pierre Rudloff 2017-04-25 01:14:21 +02:00
commit 3f053d9eed
5 changed files with 117 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

8
controllers/FrontController.php
View file

@ -213,7 +213,7 @@ class FrontController
private function getVideoResponse(Request $request, Response $response, array $params, $password = null)
{
try {
$video = $this->download->getJSON($params['url'], $this->defaultFormat, $password);
$vidarr = $this->download->getJSON($params['url'], $this->defaultFormat, $password);
} catch (PasswordException $e) {
return $this->password($request, $response);
}
@ -226,10 +226,10 @@ class FrontController
$response,
'video.tpl',
[
'video' => $video,
'vidarr' => $vidarr,
'class' => 'video',
'title' => $video->title,
'description' => 'Download "'.$video->title.'" from '.$video->extractor_key,
'title' => $vidarr[0]->title,
'description' => 'Download "'.$vidarr[0]->title.'" from '.$vidarr[0]->extractor_key,
'protocol' => $protocol,
'config' => $this->config,
'canonical' => $this->getCanonicalUrl($request),