Merge branch '0.9.x' into adminpanel

Conflicts:
	classes/User.php

diff --combined lib/action.php
index edb70c3d9d7b8c27a50a34664bfdd3af7940b6bb,4c1e7356447232f21da77d4d6207e8762c307ff6..9c7060bba831467041f554e08f6b3f2679169f32
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -434,10 -434,6 +434,10 @@@ class Action extends HTMLOutputter // l
                      $this->menuItem(common_local_url($connect),
                                      _('Connect'), _('Connect to services'), false, 'nav_connect');
                  }
 +                if ($user->hasRight(Right::CONFIGURESITE)) {
 +                    $this->menuItem(common_local_url('siteadminpanel'),
 +                                    _('Admin'), _('Change site configuration'), false, 'nav_admin');
 +                }
                  if (common_config('invite', 'enabled')) {
                      $this->menuItem(common_local_url('invite'),
                                      _('Invite'),
@@@ -989,6 -985,18 +989,18 @@@
       */
  
      function selfUrl()
+     {
+         list($action, $args) = $this->returnToArgs();
+         return common_local_url($action, $args);
+     }
+ 
+     /**
+      * Returns arguments sufficient for re-constructing URL
+      *
+      * @return array two elements: action, other args
+      */
+ 
+     function returnToArgs()
      {
          $action = $this->trimmed('action');
          $args   = $this->args;
@@@ -1002,8 -1010,7 +1014,7 @@@
          foreach (array_keys($_COOKIE) as $cookie) {
              unset($args[$cookie]);
          }
- 
-         return common_local_url($action, $args);
+         return array($action, $args);
      }
  
      /**
@@@ -1052,8 -1059,7 +1063,7 @@@
      {
          // Does a little before-after block for next/prev page
          if ($have_before || $have_after) {
-             $this->elementStart('div', array('class' => 'pagination'));
-             $this->elementStart('dl', null);
+             $this->elementStart('dl', 'pagination');
              $this->element('dt', null, _('Pagination'));
              $this->elementStart('dd', null);
              $this->elementStart('ul', array('class' => 'nav'));
@@@ -1078,7 -1084,6 +1088,6 @@@
              $this->elementEnd('ul');
              $this->elementEnd('dd');
              $this->elementEnd('dl');
-             $this->elementEnd('div');
          }
      }
  

diff --combined lib/router.php
index b143cd53790e6ca86483b39745740b57d7c21868,53f30dd3ecf031db6656c51caaeb318ba859862b..9629267ac822473bd90830140268f106b538a35b
--- 1/lib/router.php
--- 2/lib/router.php
+++ b/lib/router.php
@@@ -96,7 -96,10 +96,10 @@@ class Route
                            'unsubscribe', 'confirmaddress', 'recoverpassword',
                            'invite', 'favor', 'disfavor', 'sup',
                            'block', 'unblock', 'subedit',
-                           'groupblock', 'groupunblock');
+                           'groupblock', 'groupunblock',
+                           'sandbox', 'unsandbox',
+                           'silence', 'unsilence',
+                           'deleteuser');
  
              foreach ($main as $a) {
                  $m->connect('main/'.$a, array('action' => $a));
@@@ -585,9 -588,6 +588,9 @@@
              $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
              $m->connect('api/trends.json', array('action' => 'twitapitrends'));
  
 +            $m->connect('admin/site', array('action' => 'siteadminpanel'));
 +            $m->connect('admin/design', array('action' => 'designadminpanel'));
 +
              $m->connect('getfile/:filename',
                          array('action' => 'getfile'),
                          array('filename' => '[A-Za-z0-9._-]+'));