From 277c47732bda05b8661c789ddbf5c8100a5910be Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Mon, 4 Mar 2013 16:55:07 -0700 Subject: [PATCH 1/3] fix disable embedding option description --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index e4677b29c8..66a5db1df8 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -512,7 +512,7 @@ function admin_page_site(&$a) { '$newuser_private' => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")), '$enotify_no_content' => array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")), '$private_addons' => array('private_addons', t("Disallow public access to addons listed in the apps menu."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")), - '$disable_embedded' => array('disable_embedded', t("Don't embed private images in posts"), get_config('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos won't be able to see them unless they first visit the owner's profile page, or unless they have the redir_private_img plugin enabled.")), + '$disable_embedded' => array('disable_embedded', t("Don't embed private images in posts"), get_config('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")), '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), From 86eec2e0faf9f2029f1decbe0676c8fed88c1b65 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 5 Mar 2013 03:48:29 +0100 Subject: [PATCH 2/3] Twitter API 1.1 --- library/twitteroauth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/twitteroauth.php b/library/twitteroauth.php index 7f3dcba4d7..009ad56bd4 100644 --- a/library/twitteroauth.php +++ b/library/twitteroauth.php @@ -18,7 +18,7 @@ class TwitterOAuth { /* Contains the last API call. */ public $url; /* Set up the API root URL. */ - public $host = "https://api.twitter.com/1/"; + public $host = "https://api.twitter.com/1.1/"; /* Set timeout default. */ public $timeout = 30; /* Set connect timeout. */ From a92ef6f0fe3fd7477a6bf342edc12dc266bd172e Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Thu, 7 Mar 2013 08:16:53 -0500 Subject: [PATCH 3/3] remove authentication from api help/test. fix issue 552. identi.ca don't ask for auth on help/test. --- include/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/api.php b/include/api.php index 6001556665..45cad9ca8c 100644 --- a/include/api.php +++ b/include/api.php @@ -1433,7 +1433,7 @@ return api_apply_template('test', $type, array('$ok' => $ok)); } - api_register_func('api/help/test','api_help_test',true); + api_register_func('api/help/test','api_help_test',false); /** * https://dev.twitter.com/docs/api/1/get/statuses/friends