Merge 1.1.x into master

diff --combined classes/Profile.php
index 7005e776a59da542c91ee18fff2d8ff5e0e1ae71,540699eb3afdb692de6f1dfd5e3d5177061a8660..8a5be5f358b58916662310e25e341cb702d8e183
--- 1/classes/Profile.php
--- 2/classes/Profile.php
+++ b/classes/Profile.php
@@@ -595,8 -595,6 +595,8 @@@ class Profile extends Managed_DataObjec
              if (Event::handle('StartJoinGroup', array($group, $this))) {
                  $join = Group_member::join($group->id, $this->id);
                  self::blow('profile:groups:%d', $this->id);
 +                self::blow('group:member_ids:%d', $group->id);
 +                self::blow('group:member_count:%d', $group->id);
                  Event::handle('EndJoinGroup', array($group, $this));
              }
          }
@@@ -617,8 -615,6 +617,8 @@@
          if (Event::handle('StartLeaveGroup', array($group, $this))) {
              Group_member::leave($group->id, $this->id);
              self::blow('profile:groups:%d', $this->id);
 +            self::blow('group:member_ids:%d', $group->id);
 +            self::blow('group:member_count:%d', $group->id);
              Event::handle('EndLeaveGroup', array($group, $this));
          }
      }
@@@ -686,7 -682,7 +686,7 @@@
          $profile = new Profile();
          $tagged = array();
  
-         $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $tag));
+         $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $profile->escape($tag)));
  
          while ($profile->fetch()) {
              $tagged[] = clone($profile);

diff --combined plugins/TwitterBridge/TwitterBridgePlugin.php
index 25d8a423ca403a960fe39a51f6a368364c21663f,1b8e55e9b78d30c7ddc5ff04f378107676651d3e..cae0dbfcac889144c14abef0fcff31c496c983f5
--- 1/plugins/TwitterBridge/TwitterBridgePlugin.php
--- 2/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@@ -204,6 -204,7 +204,7 @@@ class TwitterBridgePlugin extends Plugi
              return false;
          case 'TwitterOAuthClient':
          case 'TwitterQueueHandler':
+         case 'TweetInQueueHandler':
          case 'TwitterImport':
          case 'JsonStreamReader':
          case 'TwitterStreamReader':
@@@ -557,32 -558,4 +558,32 @@@
          }
          return true;
      }
 +
 +    /**
 +     * Add links in the user's profile block to their Twitter profile URL.
 +     *
 +     * @param Profile $profile The profile being shown
 +     * @param Array   &$links  Writeable array of arrays (href, text, image).
 +     *
 +     * @return boolean hook value (true)
 +     */
 +
 +    function onOtherAccountProfiles($profile, &$links)
 +    {
 +        $fuser = null;
 +
 +        $flink = Foreign_link::getByUserID($profile->id, TWITTER_SERVICE);
 +
 +        if (!empty($flink)) {
 +            $fuser = $flink->getForeignUser();
 +
 +            if (!empty($fuser)) {
 +                $links[] = array("href" => $fuser->uri,
 +                                 "text" => sprintf(_("@%s on Twitter"), $fuser->nickname),
 +                                 "image" => $this->path("icons/twitter-bird-white-on-blue.png"));
 +            }
 +        }
 +
 +        return true;
 +    }
  }

diff --combined theme/base/css/display.css
index 483aa15ff7594651c8c5e1fe4d0ddcfae18c4f40,b0b4f26098054d7d985560d56ec45aadeb4180d0..b73078295e757b6e5a9ea9bb2b3be9a874dde486
--- 1/theme/base/css/display.css
--- 2/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@@ -688,18 -688,22 +688,22 @@@ font-style:italic
      display:none;
  }
  
+ #remoteprofile .notice .entry-title, #remoteprofile .notice div.entry-content,
  #showstream .notice .entry-title, #showstream .notice div.entry-content {
      margin-left: 0;
  }
  
+ #remoteprofile .notice .entry-title,
  #showstream .notice .entry-title {
      min-height: 1px;
  }
  
+ #remoteprofile #content .notice .author,
  #showstream #content .notice .author {
      display: none;
  }
  
+ #remoteprofile .notice,
  #showstream .notice {
      min-height: 1em; 
  }
@@@ -2549,11 -2553,6 +2553,11 @@@ display:none
      display:none;
  }
  
 +.profile_block_otherprofile_list li {
 +    display: inline;
 +    list-style-type: none;
 +}
 +
  /*end of @media screen, projection, tv*/