diff options
| author | Andrew Dolgov <[email protected]> | 2015-11-19 20:05:17 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-11-19 20:05:17 +0300 |
| commit | 4c46702672631c0cf84067d6f2c55b3bfda1db6f (patch) | |
| tree | c9e69577fab4ce761043d696e289261afb632452 /plugins/af_tumblr_1280 | |
| parent | 6497fb65b439f02cf145c2d0eb4e40803641fbb4 (diff) | |
drop support for (obsolete, removed from recent php versions) php safe_mode setting
remove ugly hacks for curl + open_basedir combination breaking support for http redirects
Diffstat (limited to 'plugins/af_tumblr_1280')
| -rwxr-xr-x[-rw-r--r--] | plugins/af_tumblr_1280/init.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/af_tumblr_1280/init.php b/plugins/af_tumblr_1280/init.php index f9938048b..985d8c5f8 100644..100755 --- a/plugins/af_tumblr_1280/init.php +++ b/plugins/af_tumblr_1280/init.php @@ -4,7 +4,7 @@ class Af_Tumblr_1280 extends Plugin { function about() { return array(1.0, - "Replace Tumblr pictures with largest size if available", + "Replace Tumblr pictures with largest size if available (requires CURL)", "fox"); } @@ -18,7 +18,8 @@ class Af_Tumblr_1280 extends Plugin { function hook_article_filter($article) { - $owner_uid = $article["owner_uid"]; + if (!function_exists("curl_init") || ini_get("open_basedir")) + return $article; $charset_hack = '<head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> @@ -46,8 +47,7 @@ class Af_Tumblr_1280 extends Plugin { curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_HEADER, true); curl_setopt($ch, CURLOPT_NOBODY, true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, - !ini_get("safe_mode") && !ini_get("open_basedir")); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); @$result = curl_exec($ch); |