friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1242 from annando/1412-stale-gprobe 

Bugfix for stale gprobe.php
This commit is contained in:
Tobias Diekershoff 2014-12-10 06:16:35 +01:00
parent f2d0baae84 04106ff6f5
commit 15d5e6cd45
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/gprobe.php
View File

@ -10,7 +10,7 @@ function gprobe_run(&$argv, &$argc){
if(is_null($a)) {
$a = new App;
}
if(is_null($db)) {
@include(".htconfig.php");
require_once("include/dba.php");
@ -37,6 +37,8 @@ function gprobe_run(&$argv, &$argc){
dbesc(normalise_link($url))
);
logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
if(! count($r)) {
$arr = probe_url($url);
@ -55,7 +57,8 @@ function gprobe_run(&$argv, &$argc){
}
if(count($r))
poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
logger("gprobe end for ".normalise_link($url), LOGGER_DEBUG);
return;
}

6
library/HTML5/Parser.php
View File

@ -17,6 +17,12 @@ class HTML5_Parser
* @return Parsed HTML as DOMDocument
*/
static public function parse($text, $builder = null) {
// Cleanup invalid HTML
$doc = new DOMDocument();
@$doc->loadHTML($text);
$text = $doc->saveHTML();
$tokenizer = new HTML5_Tokenizer($text, $builder);
$tokenizer->parse();
return $tokenizer->save();