Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

This commit is contained in:
Andrew Dolgov 2011-12-28 11:01:16 +04:00
commit 8015933d2d
1 changed files with 23 additions and 1 deletions

View File

@ -5116,13 +5116,35 @@
return $rv;
}
if (!function_exists('gzdecode')) {
function gzdecode($string) { // no support for 2nd argument
return file_get_contents('compress.zlib://data:who/cares;base64,'.
base64_encode($string));
}
}
function perform_data_import($link, $filename, $owner_uid) {
$num_imported = 0;
$num_processed = 0;
$num_feeds_created = 0;
$doc = DOMDocument::load($filename);
$doc = @DOMDocument::load($filename);
if (!$doc) {
$contents = file_get_contents($filename);
if ($contents) {
$data = @gzuncompress($contents);
}
if (!$data) {
$data = @gzdecode($contents);
}
if ($data)
$doc = DOMDocument::loadXML($data);
}
if ($doc) {