Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #513 from ArthurHoaro/hotfix/retrieve-title-issue

Browse source 
Fixes #512: retrieving title didn't match the first closing tag
This commit is contained in:
VirtualTam 2016-03-14 21:29:19 +01:00
commit 5816801b15
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/LinkUtils.php
View file

@ -9,7 +9,7 @@
*/ */
function html_extract_title($html) function html_extract_title($html)
{ {
if (preg_match('!<title>(.*)</title>!is', $html, $matches)) { if (preg_match('!<title>(.*?)</title>!is', $html, $matches)) {
return trim(str_replace("\n", ' ', $matches[1])); return trim(str_replace("\n", ' ', $matches[1]));
} }
return false; return false;

2
tests/LinkUtilsTest.php
View file

@ -15,6 +15,8 @@ public function testHtmlExtractExistentTitle()
$title = 'Read me please.'; $title = 'Read me please.';
$html = '<html><meta>stuff</meta><title>'. $title .'</title></html>'; $html = '<html><meta>stuff</meta><title>'. $title .'</title></html>';
$this->assertEquals($title, html_extract_title($html)); $this->assertEquals($title, html_extract_title($html));
$html = '<html><title>'. $title .'</title>blabla<title>another</title></html>';
$this->assertEquals($title, html_extract_title($html));
} }
/** /**