Merge pull request #646 from annando/master

OStatus conversations, "vier" and diaspora android client

diff --git a/include/api.php b/include/api.php
index 60015566659452dc00782b26608f43d1ec18d323..45cad9ca8c852b9af687046566d380b53874fda0 100644 (file)
--- 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 

diff --git a/library/twitteroauth.php b/library/twitteroauth.php
index 7f3dcba4d77728bd090af034962bd95bb1d52c4d..009ad56bd4a3b76a7048dafd7b2724e2118ce7ef 100644 (file)
--- 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. */

diff --git a/mod/admin.php b/mod/admin.php
index e4677b29c8b4136e0af6bbccc93b3d90165a522a..66a5db1df864bd419e5ec0ed6bcd2057ce03b3c8 100644 (file)
--- 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.")),