Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x

diff --combined EVENTS.txt
index 56cbe14c7a97ee2ccc375c98971769f410e12611,cf9c6123f34894f9bdaa0f737317ab87f78ebbdd..0a1565752a91035e60fe3f6f919d179f672e54a3
--- 1/EVENTS.txt
--- 2/EVENTS.txt
+++ b/EVENTS.txt
@@@ -141,7 -141,7 +141,7 @@@ StartLogout: Before logging ou
  EndLogout: After logging out
  - $action: the logout action
  
- ArgsInitialized: After the argument array has been initialized
+ ArgsInitialize: After the argument array has been initialized
  - $args: associative array of arguments, can be modified
  
  StartAddressData: Allows the site owner to provide additional information about themselves for contact (e.g., tagline, email, location)
@@@ -716,24 -716,6 +716,24 @@@ StartShowContentLicense: Showing the de
  EndShowContentLicense: Showing the default license for content
  - $action: the current action
  
 +GetImTransports: Get IM transports that are available
 +- &$transports: append your transport to this array like so: $transports[transportName]=array('display'=>display)
 +
 +NormalizeImScreenname: Normalize an IM screenname
 +- $transport: transport the screenname is on
 +- &$screenname: screenname to be normalized
 +
 +ValidateImScreenname: Validate an IM screenname
 +- $transport: transport the screenname is on
 +- $screenname: screenname to be validated
 +- $valid: is the screenname valid?
 +
 +SendImConfirmationCode: Send a confirmation code to confirm a user owns an IM screenname
 +- $transport: transport the screenname exists on
 +- $screenname: screenname being confirmed
 +- $code: confirmation code for confirmation URL
 +- $user: user requesting the confirmation
 +
  StartUserRegister: When a new user is being registered
  - &$profile: new profile data (no ID)
  - &$user: new user account (no ID or URI)

diff --combined lib/command.php
index c2116828c00914de1c1669932355c129bfaf84cb,216f9e649a33af4660bdc4fcaa2965571d0b1d0c..084c61fd1a119ad5dbb082535a15750e73856b04
--- 1/lib/command.php
--- 2/lib/command.php
+++ b/lib/command.php
@@@ -273,7 -273,7 +273,7 @@@ class FavCommand extends Comman
      function handle($channel)
      {
          $notice = $this->getNotice($this->other);
-         $fave = Fave::addNew($this->user, $notice);
+         $fave = Fave::addNew($this->user->getProfile(), $notice);
  
          if (!$fave) {
              $channel->error($this->user, _('Could not create favorite.'));
@@@ -652,7 -652,7 +652,7 @@@ class OffCommand extends Comman
      }
      function handle($channel)
      {
 -        if ($other) {
 +        if ($this->other) {
              $channel->error($this->user, _("Command not yet implemented."));
          } else {
              if ($channel->off($this->user)) {
@@@ -675,7 -675,7 +675,7 @@@ class OnCommand extends Comman
  
      function handle($channel)
      {
 -        if ($other) {
 +        if ($this->other) {
              $channel->error($this->user, _("Command not yet implemented."));
          } else {
              if ($channel->on($this->user)) {

diff --combined lib/util.php
index 0f639df388e0a7a740833ae68f145ae9c9d25ecf,795997868305ff09b2ada3614cf7a9a8d1089cf3..2add66508b99040ebdf8f7032e7bf17622f6d2da
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -1176,10 -1176,19 +1176,10 @@@ function common_enqueue_notice($notice
          $transports[] = 'plugin';
      }
  
 -    $xmpp = common_config('xmpp', 'enabled');
 -
 -    if ($xmpp) {
 -        $transports[] = 'jabber';
 -    }
 -
      // @fixme move these checks into QueueManager and/or individual handlers
      if ($notice->is_local == Notice::LOCAL_PUBLIC ||
          $notice->is_local == Notice::LOCAL_NONPUBLIC) {
          $transports = array_merge($transports, $localTransports);
 -        if ($xmpp) {
 -            $transports[] = 'public';
 -        }
      }
  
      if (Event::handle('StartEnqueueNotice', array($notice, &$transports))) {
@@@ -1520,7 -1529,8 +1520,8 @@@ function common_user_uri(&$user
  function common_notice_uri(&$notice)
  {
      return common_local_url('shownotice',
-                             array('notice' => $notice->id));
+                             array('notice' => $notice->id),
+                             null, null, false);
  }
  
  // 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits