Merge branch 'master'

diff --cc com.woltlab.wcf/option.xml
Simple merge

diff --cc com.woltlab.wcf/templates/user.tpl
Simple merge

diff --cc wcfsetup/install/files/lib/acp/page/IndexPage.class.php
index 8507138ea01e297ebf8b91fcb1a029dd0ccb7e83,5d257203f20b1d5983a955a88031a65518faf86c..7969ae88ec029ead3ed37353890b24fdb3e3fde3
--- 1/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
--- 2/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
@@@ -1,6 -1,6 +1,7 @@@
  <?php
  namespace wcf\acp\page;
 +use wcf\data\user\User;
+ use wcf\data\devtools\missing\language\item\DevtoolsMissingLanguageItemList;
  use wcf\page\AbstractPage;
  use wcf\system\application\ApplicationHandler;
  use wcf\system\cache\builder\OptionCacheBuilder;

diff --cc wcfsetup/install/files/lib/data/user/User.class.php
index dfdca333b003a632fa077972595de35e763923e0,d3b340b4bbdf12aa17d8ac88cb2595ac12e55e7f..05f64cd57a5cb11fe76f27da13bfc3026d4b8725
--- 1/wcfsetup/install/files/lib/data/user/User.class.php
--- 2/wcfsetup/install/files/lib/data/user/User.class.php
+++ b/wcfsetup/install/files/lib/data/user/User.class.php
@@@ -645,53 -628,10 +644,60 @@@ final class User extends DatabaseObjec
                }, $this->getBlacklistMatches());
        }
        
 +      /**
 +       * Returns true if this user is not activated.
 +       *
 +       * @return      boolean
 +       * @since       5.3
 +       */
 +      public function pendingActivation() {
 +              return $this->activationCode != 0;
 +      }
 +      
 +      /**
 +       * Returns true if this user requires activation by the user.
 +       *
 +       * @return      boolean
 +       * @since       5.3
 +       */
 +      public function requiresEmailActivation() {
 +              return REGISTER_ACTIVATION_METHOD & self::REGISTER_ACTIVATION_USER && $this->pendingActivation() && !$this->isEmailConfirmed();
 +      }
 +      
 +      /**
 +       * Returns true if this user requires the activation by an admin.
 +       *
 +       * @return      boolean
 +       * @since       5.3
 +       */
 +      public function requiresAdminActivation() {
 +              return REGISTER_ACTIVATION_METHOD & self::REGISTER_ACTIVATION_ADMIN && $this->pendingActivation();
 +      }
 +      
 +      /**
 +       * Returns true if this user can confirm the email themself.
 +       *
 +       * @return      boolean
 +       * @since       5.3
 +       */
 +      public function canEmailConfirm() {
 +              return REGISTER_ACTIVATION_METHOD & self::REGISTER_ACTIVATION_USER && !$this->isEmailConfirmed();
 +      }
 +      
 +      /**
 +       * Returns true, if the user must confirm his email by themself. 
 +       * 
 +       * @return      boolean
 +       * @since       5.3
 +       */
 +      public function mustSelfEmailConfirm() {
 +              return REGISTER_ACTIVATION_METHOD & self::REGISTER_ACTIVATION_USER;
 +      }
++      
+       /**
+        * @inheritDoc
+        */
+       public function getPopoverLinkClass() {
+               return 'userLink';
+       }
  }

diff --cc wcfsetup/install/files/lib/data/user/UserAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/user/UserProfile.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/form/RegisterForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge

diff --cc wcfsetup/setup/db/install.sql
Simple merge