Merge branch '0.9.x' into adminpanel

diff --combined classes/User.php
index 447a34141b1c28b90f38f95c2abc85acfd27c733,c529b82e0bb6457e1955c6c241374f6fb60da567..7267ec2d793a3788b8ab8c1ea68ca64cf9032af3
--- 1/classes/User.php
--- 2/classes/User.php
+++ b/classes/User.php
@@@ -87,7 -87,7 +87,7 @@@ class User extends Memcached_DataObjec
          return (is_null($sub)) ? false : true;
      }
  
-     // 'update' won't write key columns, so we have to do it ourselves.
+     // 'update' will not write key columns, so we have to do it ourselves.
  
      function updateKeys(&$orig)
      {
@@@ -384,7 -384,7 +384,7 @@@
                  return false;
              }
  
-             // Otherwise, cache doesn't have all faves;
+             // Otherwise, cache does not have all faves;
              // fall through to the default
          }
  
@@@ -463,7 -463,7 +463,7 @@@
      {
          $cache = common_memcache();
          if ($cache) {
-             // Faves don't happen chronologically, so we need to blow
+             // Faves do not happen chronologically, so we need to blow
              // ;last cache, too
              $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id));
              $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last'));
@@@ -710,7 -710,6 +710,7 @@@
                  break;
              case Right::CONFIGURESITE:
                  $result = $this->hasRole(User_role::ADMINISTRATOR);
 +                break;
              default:
                  $result = false;
                  break;