devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 10:22:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3215 from wallabag/fix-3192

Browse Source 
Empty preview pictures and language return null
This commit is contained in:
Jérémy Benoist 2017-06-20 06:43:59 +02:00 committed by GitHub
commit 604cca1f42
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View File

@ -120,12 +120,12 @@ class ContentProxy
$this->validateAndSetLanguage(
$entry,
isset($content['language']) ? $content['language'] : ''
isset($content['language']) ? $content['language'] : null
);
$this->validateAndSetPreviewPicture(
$entry,
isset($content['open_graph']['og_image']) ? $content['open_graph']['og_image'] : ''
isset($content['open_graph']['og_image']) ? $content['open_graph']['og_image'] : null
);
// if content is an image, define it as a preview too

6
tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
View File

@ -206,7 +206,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('http://1.1.1.1', $entry->getUrl());
$this->assertEquals('this is my title', $entry->getTitle());
$this->assertContains('this is my content', $entry->getContent());
$this->assertEmpty($entry->getPreviewPicture());
$this->assertNull($entry->getPreviewPicture());
$this->assertEquals('text/html', $entry->getMimetype());
$this->assertEquals('fr', $entry->getLanguage());
$this->assertEquals('200', $entry->getHttpStatus());
@ -252,7 +252,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('this is my title', $entry->getTitle());
$this->assertContains('this is my content', $entry->getContent());
$this->assertEquals('text/html', $entry->getMimetype());
$this->assertEmpty($entry->getLanguage());
$this->assertNull($entry->getLanguage());
$this->assertEquals('200', $entry->getHttpStatus());
$this->assertEquals(4.0, $entry->getReadingTime());
$this->assertEquals('1.1.1.1', $entry->getDomainName());
@ -300,7 +300,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('http://1.1.1.1', $entry->getUrl());
$this->assertEquals('this is my title', $entry->getTitle());
$this->assertContains('this is my content', $entry->getContent());
$this->assertEmpty($entry->getPreviewPicture());
$this->assertNull($entry->getPreviewPicture());
$this->assertEquals('text/html', $entry->getMimetype());
$this->assertEquals('fr', $entry->getLanguage());
$this->assertEquals('200', $entry->getHttpStatus());