* develop-olympus:
[ticket/10021] Add comment explaining why we can check -1 as an error value.
[ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
* bantu/ticket/10021:
[ticket/10021] Add comment explaining why we can check -1 as an error value.
[ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
There is no member.S_PENDING_SET variable.
This fixes an XHTML error when managing groups with both approved and pending
users from the UCP.
PHPBB3-10102
phpass (the hashing library we use) adds a hash identifier to every
hash. By default this identifier is '$P$'. For some reason we have
changed it to '$H$'.
This patch allows both of them to be used for authentication, so that a
third party system could create users with '$P$' hashes.
PHPBB3-10101
Update $config['rand_seed_last_update'] before updating $config['rand_seed'] in
unique_id() to mitigate a race condition and unnecessary updates on heavily
busy boards.
PHPBB3-10100
To have a generic solution there is now a sql_buffer_nested_transaction()
which indicates that the given SQL driver requires buffering to run a
transaction while iterating over another result set.
PHPBB3-9685
* develop-olympus:
[ticket/10096] Fixed whitespace in functions.php.
[ticket/10078] Avoid \n in strings given to echo for portability.
[ticket/10092] Ignore overlength comment lines in commit-msg hook.
* develop-olympus:
[ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
[ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
* ticket/bantu/8802:
[ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
[ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
* develop-olympus:
[ticket/10046] Do not link bots to cron.php.
[ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
[ticket/10046] Call flush() in cron.php
[ticket/10046] Remove calls to register_shutdown_function() in cron.php
Conflicts:
phpBB/cron.php
phpBB/includes/functions.php
* ticket/bantu/10046:
[ticket/10046] Do not link bots to cron.php.
[ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
[ticket/10046] Call flush() in cron.php
[ticket/10046] Remove calls to register_shutdown_function() in cron.php
After reading some PHP source as well as the PHP manual we have arrived at the
following two situations with one conclusion:
* SAPI supports flush():
o call to flush() is enough to stop the page from displaying as loading
o and thus register_shutdown_function is unnecessary
* SAPI does not support flush():
o neither a call to flush() nor the beginning of shutdown phase, which calls
registered shutdown functions can flush anything to the client
o and thus register_shutdown_function is unnecessary
Thanks to lacton for reporting the initial issue.
Thanks to nn- and naderman for doing all the dirty works.
PHPBB3-10046
* develop-olympus:
[ticket/9970] Rename validate_language() to validate_language_iso_name().
[ticket/9970] Do not allow switching to languages not installed on reg. page.
[ticket/9970] Check whether language pack is installed.
[ticket/9970] User language input is checked for existance
* ticket/bantu/9970:
[ticket/9970] Rename validate_language() to validate_language_iso_name().
[ticket/9970] Do not allow switching to languages not installed on reg. page.
[ticket/9970] Check whether language pack is installed.
[ticket/9970] User language input is checked for existance
