aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-11-19 21:15:21 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-11-19 21:15:21 +0100
commitc628cd7e151a09e25ca0d980620b5fa3fe36a763 (patch)
tree242e90b696746171f94d31bbf7c24afcf0550a92
parent83d430419e86404bb54a813f853051dd9c696eb3 (diff)
downloadforums-c628cd7e151a09e25ca0d980620b5fa3fe36a763.tar
forums-c628cd7e151a09e25ca0d980620b5fa3fe36a763.tar.gz
forums-c628cd7e151a09e25ca0d980620b5fa3fe36a763.tar.bz2
forums-c628cd7e151a09e25ca0d980620b5fa3fe36a763.tar.xz
forums-c628cd7e151a09e25ca0d980620b5fa3fe36a763.zip
[ticket/16167] Deprecate phpbb_email_hash() and remove gen_email_hash()
The latter one has been deprecated for 10 years now. PHPBB3-16167
-rw-r--r--phpBB/includes/functions.php12
-rw-r--r--phpBB/includes/functions_compatibility.php14
-rw-r--r--phpBB/includes/functions_convert.php10
3 files changed, 14 insertions, 22 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d2d5b503a2..c1f77a817b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -264,18 +264,6 @@ function still_on_time($extra_time = 15)
}
/**
-* Hashes an email address to a big integer
-*
-* @param string $email Email address
-*
-* @return string Unsigned Big Integer
-*/
-function phpbb_email_hash($email)
-{
- return sprintf('%u', crc32(strtolower($email))) . strlen($email);
-}
-
-/**
* Wrapper for version_compare() that allows using uppercase A and B
* for alpha and beta releases.
*
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 2578290875..92e24c055c 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -659,3 +659,17 @@ function phpbb_inet_pton($address)
{
return inet_pton($address);
}
+
+/**
+ * Hashes an email address to a big integer
+ *
+ * @param string $email Email address
+ *
+ * @return string Unsigned Big Integer
+ *
+ * @deprecated 3.3.0-b2 (To be removed: 4.0.0)
+ */
+function phpbb_email_hash($email)
+{
+ return sprintf('%u', crc32(strtolower($email))) . strlen($email);
+}
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 13e01afe51..df4c9b1875 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -207,16 +207,6 @@ function get_group_id($group_name)
}
/**
-* Generate the email hash stored in the users table
-*
-* Note: Deprecated, calls should directly go to phpbb_email_hash()
-*/
-function gen_email_hash($email)
-{
- return phpbb_email_hash($email);
-}
-
-/**
* Convert a boolean into the appropriate phpBB constant indicating whether the topic is locked
*/
function is_topic_locked($bool)