Merge pull request #6855 from Derky/ticket/17547

[ticket/17547] Use confirm_type enum in captcha init()

Author: marc1706

phpBB/includes/acp/acp_captcha.php

@@ -194,7 +194,7 @@ function deliver_demo($selected)
 		global $phpbb_container;
 
 		$captcha = $phpbb_container->get('captcha.factory')->get_instance($selected);
-		$captcha->init(CONFIRM_REG);
+		$captcha->init(\phpbb\captcha\plugins\confirm_type::REGISTRATION);
 		$captcha->execute_demo();
 
 		garbage_collection();

phpBB/includes/functions.php

@@ -2408,7 +2408,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 			case LOGIN_ERROR_ATTEMPTS:
 
 				$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
-				$captcha->init(CONFIRM_LOGIN);
+				$captcha->init(\phpbb\captcha\plugins\confirm_type::LOGIN);
 				// $captcha->reset();
 
 				$template->assign_vars(array(

phpBB/includes/ucp/ucp_login_link.php

@@ -216,7 +216,7 @@ protected function process_login_result($result)
 				case LOGIN_ERROR_ATTEMPTS:
 
 					$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
-					$captcha->init(CONFIRM_LOGIN);
+					$captcha->init(\phpbb\captcha\plugins\confirm_type::LOGIN);
 
 					$template->assign_vars(array(
 						'CAPTCHA_TEMPLATE'			=> $captcha->get_template(),