Merge branch 'master' of github.com:mitsukarenai/Projet-Autoblog

This commit is contained in:
ArthurHoaro 2013-07-19 12:22:16 +02:00
commit 7d7e1c90a9
2 changed files with 2 additions and 2 deletions

View file

@ -40,7 +40,7 @@
$friends_autoblog_farm = array(
'https://raw.github.com/mitsukarenai/xsaf-bootstrap/master/3.json',
// 'https://www.ecirtam.net/autoblogs/?export',
// 'https://autoblog.suumitsu.eu/?export',
// 'http://autoblog.suumitsu.eu/?export',
// 'http://streisand.hoa.ro/?export',
);
?>

View file

@ -120,7 +120,7 @@ function xsafimport($xsafremote, $max_exec_time) {
$json_media_import = file_get_contents($remote_media);
if(DEBUG)
debug($json_media_import);
if(!empty($json_media_import) && !strpos($json_media_import, '[]}'))
if(!empty($json_media_import) && !strpos($json_media_import, '[]}') && json_decode($json_media_import) !== null)
{
file_put_contents('./'. $foldername .'/import.json', $json_media_import);
}