timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

develop #23

Manually merged
timw4mail merged 7 commits from develop into master 2019-08-16 10:39:59 -04:00
Conversation 0 Commits 7 Files Changed 25 +5 -3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c6b74e2775 - Show all commits

2
.travis.yml
View File

@ -6,6 +6,8 @@ install:
php: php:
- 7.1 - 7.1
- 7.2 - 7.2
- 7.3
- 7.4
- hhvm - hhvm
- nightly - nightly

4
src/Controller.php
View File

@ -154,7 +154,7 @@ class Controller {
if (null === $url) if (null === $url)
{ {
$url = $util->isViewPage() $url = $util->isViewPage()
? $this->request->getUri()->__toString() ? (string) $this->request->getUri()
: $serverParams['HTTP_REFERER']; : $serverParams['HTTP_REFERER'];
} }
@ -245,7 +245,7 @@ class Controller {
$csp = [ $csp = [
"default-src 'self'", "default-src 'self'",
"object-src 'none'", "object-src 'none'",
"frame-src *.youtube.com", 'frame-src *.youtube.com',
]; ];
$view->addHeader('Content-Security-Policy', implode('; ', $csp)); $view->addHeader('Content-Security-Policy', implode('; ', $csp));

2
src/Model/API.php
View File

@ -44,7 +44,7 @@ class API {
array_multisort($sort, SORT_ASC, $array); array_multisort($sort, SORT_ASC, $array);
// Re-key array items by their ids // Re-key array items by their ids
if (array_key_exists('id', $array[0])) if (array_key_exists('id', (array)$array[0]))
{ {
$keyed = []; $keyed = [];