From d847df717573a55cc6e13211fbe853b4784cf53c Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sat, 24 Aug 2013 22:10:10 -0400
Subject: [PATCH] [feature/oauth] A few more minor changes

PHPBB3-11673
---
 phpBB/includes/ucp/ucp_register.php               | 13 +++++++++++++
 phpBB/phpbb/auth/provider/oauth/token_storage.php |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 8400e98630..e3a1ac1fb0 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -506,6 +506,12 @@ class ucp_register
 		$this->page_title = 'UCP_REGISTRATION';
 	}
 
+	/**
+	* Creates the login_link data array
+	*
+	* @return	array	Returns an array of all POST paramaters whose names
+	*					begin with 'login_link_'
+	*/
 	protected function get_login_link_data_array()
 	{
 		global $request;
@@ -525,6 +531,13 @@ class ucp_register
 		return $login_link_data;
 	}
 
+	/**
+	* Prepends they key names of an associative array with 'login_link_' for
+	* inclusion on the page as hidden fields.
+	*
+	* @param	array	$data	The array to be modified
+	* @return	array	The modified array
+	*/
 	protected function get_login_link_data_for_hidden_fields($data)
 	{
 		$new_data = array();
diff --git a/phpBB/phpbb/auth/provider/oauth/token_storage.php b/phpBB/phpbb/auth/provider/oauth/token_storage.php
index 05e308d192..c0fce10e17 100644
--- a/phpBB/phpbb/auth/provider/oauth/token_storage.php
+++ b/phpBB/phpbb/auth/provider/oauth/token_storage.php
@@ -301,7 +301,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
 
 		if ($token_data === null)
 		{
-			throw new TokenNotFoundException('Token not stored correctly');
+			throw new TokenNotFoundException('AUTH_PROVIDER_OAUTH_TOKEN_ERROR_INCORRECTLY_STORED');
 		}
 
 		$token_class	= $token_data['token_class'];