Merge branch 'master' into next

diff --cc wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
index 3c9b9a4240effbec9bc94fe2a8e78d8dc6503ca2,2e90edb36a2ca6d4318eb4d4288c8c68c5bdbfd6..f6bd966b5b6c1eb426445ba3b9d49ff9e4ec10bc
--- 1/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
--- 2/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
+++ b/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
@@@ -146,9 -145,9 +146,9 @@@ class FacebookAuthAction extends Abstra
                }
                
                // start auth by redirecting to facebook
 -              $token = StringUtil::getRandomID();
 +              $token = bin2hex(\random_bytes(20));
                WCF::getSession()->register('__facebookInit', $token);
-               HeaderUtil::redirect("https://www.facebook.com/dialog/oauth?client_id=".StringUtil::trim(FACEBOOK_PUBLIC_KEY). "&redirect_uri=".rawurlencode($callbackURL)."&state=".$token."&scope=email,user_about_me,user_birthday,user_location,user_website");
+               HeaderUtil::redirect("https://www.facebook.com/dialog/oauth?client_id=".StringUtil::trim(FACEBOOK_PUBLIC_KEY). "&redirect_uri=".rawurlencode($callbackURL)."&state=".$token."&scope=email,user_birthday,user_location");
                $this->executed();
                exit;
        }

diff --cc wcfsetup/install/files/lib/data/article/FeedArticle.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php
Simple merge

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

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

diff --cc wcfsetup/install/files/lib/system/MetaTagHandler.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/WCF.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/WCFSetup.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/captcha/RecaptchaHandler.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/html/node/AbstractHtmlNodeProcessor.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/option/CaptchaSelectOptionType.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/util/XML.class.php
Simple merge