statusnet/gnu-social merge request 21

diff --git a/js/util.js b/js/util.js
index c1a3b771537949dfb9d229b3ea455bd0d88400c9..c300a0d93edf792547f0cbd4ff22114c2682b41a 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -773,7 +773,7 @@ var SN = { // StatusNet
          *
          */
         NoticeRepeat: function () {
-            $('.form_repeat').on('click', function (e) {
+            $('body').on('click', '.form_repeat', function (e) {
                 e.preventDefault();
 
                 SN.U.NoticeRepeatConfirmation($(this));
@@ -1361,7 +1361,7 @@ var SN = { // StatusNet
 
             var profileLink = $('#nav_profile a').attr('href');
             if (profileLink) {
-                var authorUrl = $(notice).find('.h-card.u-url').attr('href');
+                var authorUrl = $(notice).find('.h-card.p-author').attr('href');
                 if (authorUrl == profileLink) {
                     if (action == 'all' || action == 'showstream') {
                         // Posts always show on your own friends and profile streams.
@@ -1374,7 +1374,7 @@ var SN = { // StatusNet
             // Mismatch between id-based and name-based user/group links currently complicates
             // the lookup, since all our inline mentions contain the absolute links but the
             // UI links currently on the page use malleable names.
-
+            
             return false;
         },
 

diff --git a/lib/mediafile.php b/lib/mediafile.php
index f44bfae1fa2cc86965c547fb4b84c646642d4842..92a069facf4011af39028e8729c2ba6acaa0cb25 100644 (file)
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -132,7 +132,7 @@ class MediaFile
     {
         $file_redir = File_redirection::getKV('url', $url);
 
-        if ($file_redir instanceof File_redirection) {
+        if (!$file_redir instanceof File_redirection) {
             $file_redir = new File_redirection;
             $file_redir->url = $url;
             $file_redir->file_id = $file_id;

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 4ff1a344a124532ec3c2d063ce661a7e5bd0aaef..b607fe605275e49fba5837207b6e9b87e4eb60bd 100644 (file)
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -121,7 +121,8 @@ function is_twitter_bound($notice, $flink) {
         // If it's not a Twitter-style reply, or if the user WANTS to send replies,
         // or if it's in reply to a twitter notice
         if ( (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) ||
-             (is_twitter_notice($notice->reply_to) || is_twitter_notice($notice->repeat_of)) ||
+              ((is_twitter_notice($notice->reply_to) || is_twitter_notice($notice->repeat_of))
+              && (($flink->noticesync & FOREIGN_NOTICE_RECV) == FOREIGN_NOTICE_RECV)) ||
              (empty($notice->reply_to) && !preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content)) ){
             return true;
         }