From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 19 Jun 2014 22:15:54 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~690
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0729f9492c094be4f9198001acfc1ba9f3c0c04a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/WCF.Message.js
	wcfsetup/install/files/js/WCF.Message.min.js
	wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
---

0729f9492c094be4f9198001acfc1ba9f3c0c04a
diff --cc wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
index 0b73bd0e46,ac8134f590..88e54aedb8
--- a/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
+++ b/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
@@@ -128,11 -128,8 +128,11 @@@ class GoogleAuthAction extends Abstract
  					
  					WCF::getSession()->register('__googleData', $userData);
  					
- 					// we assume that bots won't register on facebook first
+ 					// we assume that bots won't register on google first
 -					WCF::getSession()->register('recaptchaDone', true);
 +					// thus no need for a captcha
 +					if (REGISTER_CAPTCHA_TYPE) {
 +						WCF::getSession()->register('noRegistrationCaptcha', true);
 +					}
  					
  					WCF::getSession()->update();
  					HeaderUtil::redirect(LinkHandler::getInstance()->getLink('Register'));