From: Brion Vibber <brion@pobox.com>
Date: Mon, 25 Oct 2010 20:08:57 +0000 (-0700)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ca489631db840e33757a71a7e4cb56b187c182d3;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x

Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php
---

ca489631db840e33757a71a7e4cb56b187c182d3
diff --cc actions/subscriptions.php
index da563a218f,ba2f67f2da..45dbaf3b3d
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@@ -207,7 -222,8 +224,8 @@@ class SubscriptionsListItem extends Sub
              }
  
              $this->out->element('input', $attrs);
+             // TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
 -            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber'));
 +            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('IM'));
          } else {
              $this->out->hidden('jabber', $sub->jabber);
          }
diff --cc lib/router.php
index 54d3d0f68b,9aaac7dfe3..32292397e0
--- a/lib/router.php
+++ b/lib/router.php
@@@ -704,14 -697,7 +710,15 @@@ class Route
              $m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel'));
              $m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
              $m->connect('admin/license', array('action' => 'licenseadminpanel'));
+ 
 +            $m->connect('admin/plugins', array('action' => 'pluginsadminpanel'));
 +            $m->connect('admin/plugins/enable/:plugin',
 +                        array('action' => 'pluginenable'),
 +                        array('plugin' => '[A-Za-z0-9_]+'));
 +            $m->connect('admin/plugins/disable/:plugin',
 +                        array('action' => 'plugindisable'),
 +                        array('plugin' => '[A-Za-z0-9_]+'));
 +
              $m->connect('getfile/:filename',
                          array('action' => 'getfile'),
                          array('filename' => '[A-Za-z0-9._-]+'));