forked from blallo/rss-bridge
fucked up merge ><
This commit is contained in:
parent
e5c4e053ed
commit
b8ec283458
1 changed files with 0 additions and 9 deletions
|
@ -24,12 +24,6 @@ if (!extension_loaded('openssl'))
|
|||
|
||||
// FIXME : beta test UA spoofing, please report any blacklisting by PHP-fopen-unfriendly websites
|
||||
ini_set('user_agent', 'Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20121202 Firefox/30.0 (rss-bridge/0.1; +https://github.com/sebsauvage/rss-bridge)');
|
||||
<<<<<<< HEAD
|
||||
|
||||
// -------
|
||||
=======
|
||||
>>>>>>> a40bbbd2deb5f59d88d61fe2253a16c28deb900b
|
||||
|
||||
// cache file purge - delete cache files older than 24 hours
|
||||
$cacheTimeLimit = time() - 60*60*24 ;
|
||||
$cachePath = 'cache';
|
||||
|
@ -81,10 +75,7 @@ else {
|
|||
array_pop($whitelist_selection);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
Cache::purge();
|
||||
>>>>>>> a40bbbd2deb5f59d88d61fe2253a16c28deb900b
|
||||
|
||||
try{
|
||||
|
||||
|
|
Loading…
Reference in a new issue