aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-10-14 12:31:32 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-10-14 12:31:32 +0000
commit2b60a090eec8bd5cc3778379c730e4c9e1dd38eb (patch)
tree51742f536085a49639a1f999b2dfecea7e679394 /phpBB
parentea46faa8ffd7eac3696a2a12d9ceddad5f625e8e (diff)
downloadforums-2b60a090eec8bd5cc3778379c730e4c9e1dd38eb.tar
forums-2b60a090eec8bd5cc3778379c730e4c9e1dd38eb.tar.gz
forums-2b60a090eec8bd5cc3778379c730e4c9e1dd38eb.tar.bz2
forums-2b60a090eec8bd5cc3778379c730e4c9e1dd38eb.tar.xz
forums-2b60a090eec8bd5cc3778379c730e4c9e1dd38eb.zip
#14736
#14725 git-svn-id: file:///svn/phpbb/trunk@8179 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html4
-rw-r--r--phpBB/includes/functions_convert.php10
2 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f7c936c012..23ef2e5d12 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -83,6 +83,10 @@
<ul>
<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
<li>[Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions</li>
+ <li>[Fix] Fixed faulty form token for acp_ranks (Bug #14736)</li>
+ <li>[Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14725)</li>
+
+
</ul>
<a name="v30rc5"></a><h3>1.ii. Changes since 3.0.RC5</h3>
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 3a572e128c..ed35be3db7 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -224,9 +224,17 @@ function is_topic_locked($bool)
*/
function make_uid($timestamp)
{
- return substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
+ static $last_timestamp, $last_uid;
+
+ if (empty($last_timestamp) || $timestamp != $last_timestamp)
+ {
+ $last_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
+ }
+ $last_timestamp = $timestamp;
+ return $last_uid;
}
+
/**
* Validate a website address
*/