diff options
| author | Andrew Manning <tamanning@zoho.com> | 2015-11-30 07:50:21 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2015-11-30 07:50:21 -0500 |
| commit | d4b04d22eda4e60f5c6d11d1cb2223dee912783a (patch) | |
| tree | f50541fa6c275b53a284f14694b7462e5763caa4 /include/zot.php | |
| parent | b1f4b9759b34249540d81aed724aa023153e2b53 (diff) | |
| parent | 650f882265cc0256fa85046baacca9dc6db56d24 (diff) | |
| download | volse-hubzilla-d4b04d22eda4e60f5c6d11d1cb2223dee912783a.tar.gz volse-hubzilla-d4b04d22eda4e60f5c6d11d1cb2223dee912783a.tar.bz2 volse-hubzilla-d4b04d22eda4e60f5c6d11d1cb2223dee912783a.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into update-addon-script
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/zot.php b/include/zot.php index e575f3d05..6764072aa 100644 --- a/include/zot.php +++ b/include/zot.php @@ -554,18 +554,8 @@ function zot_gethub($arr,$multiple = false) { if($arr['guid'] && $arr['guid_sig'] && $arr['url'] && $arr['url_sig']) { - $blacklisted = false; - $bl1 = get_config('system','blacklisted_sites'); - if(is_array($bl1) && $bl1) { - foreach($bl1 as $bl) { - if($bl && strpos($arr['url'],$bl) !== false) { - $blacklisted = true; - break; - } - } - } - if($blacklisted) { - logger('zot_gethub: blacklisted site: ' . $arr['url']); + if(! check_siteallowed($arr['url'])) { + logger('blacklisted site: ' . $arr['url']); return null; } |