summaryrefslogtreecommitdiff
path: root/plugins/af_tumblr_1280/init.php
diff options
context:
space:
mode:
authorHeiko Adams <[email protected]>2015-11-30 10:29:44 +0100
committerHeiko Adams <[email protected]>2015-11-30 10:29:44 +0100
commit05761788b7b5a8a7e6c14333669acd0793886223 (patch)
tree464ccc3d98900e5dcf1a437662056161fa1280a4 /plugins/af_tumblr_1280/init.php
parent635ecdb9fa039adb8a0e8ead045bfda023e72bc4 (diff)
parent6f5d9c6889b6376527d7598857ac8816cf7980ab (diff)
Merge remote-tracking branch 'origin/master' into german-translation
Diffstat (limited to 'plugins/af_tumblr_1280/init.php')
-rwxr-xr-x[-rw-r--r--]plugins/af_tumblr_1280/init.php8
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);