twitter: One unregister hook was missing

diff --git a/twitter/twitter.php b/twitter/twitter.php
index e18b74452756702f65af71578cea142d86e6186a..3cabbff3d500903ca04398a709e10ab4c6f6281f 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -84,6 +84,7 @@ function twitter_uninstall() {
        unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
        unregister_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
        unregister_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
+       unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
 
        // old setting - remove only
        unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
@@ -1411,7 +1412,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                $postarray['tag'] = $converted["tags"];
 
 
-               if (!intval(get_config('system','wall-to-wall_share'))) {
+               // Deactivated at the moment, since there are problems with answers to retweets
+               if (false AND !intval(get_config('system','wall-to-wall_share'))) {
                        $postarray['body'] = "[share author='".$post->retweeted_status->user->name.
                                "' profile='https://twitter.com/".$post->retweeted_status->user->screen_name.
                                "' avatar='".$post->retweeted_status->user->profile_image_url_https.