* ticket/bantu/9534:
[ticket/9534] Update function documentation for user_ipwhois().
[ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
* ticket/bantu/9694:
[ticket/9694] Call error_reporting() in download/file.php when in avatar mode.
[ticket/9694] Make sure string offset 0 exists to avoid E_NOTICE message.
* ticket/bantu/9167:
[ticket/9167] Detect and remove any dead left over shadow topics on update.
[ticket/9167] Remove shadow topics from remaining forums when deleting a forum
Conflicts:
phpBB/install/database_update.php
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.
PHPBB3-9519
* task/cs278/git-tools:
[task/git-tools] Ignore git commit message comments
[task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
[task/git-tools] Vastly expanded commit-msg hook.
[task/git-tools] Beginnings of a syntax checking hook.
[task/git-tools] Append ticket identifier to commit message prior to editing.
[task/git-tools] add install and uninstall scripts for hooks
[task/git-tools] move ticket id appending to commit-msg hook
[task/git-tools] append ticket id to git log message
This updated hook supports validates each line of the commit message
confirms to the phpBB standards [1], there are two git config options
which adjust the behaviour of the hook. They are:
* phpbb.hooks.commit-msg.fatal: Set to false for the hook to allow
commits with malformed structure, useful if you'll be squashing
or editing the commits later. True is the default value.
* phpbb.hooks.commit-msg.debug: Any integer value greater than 0 will
increase the debugging verbosity of the hook, the default value is 0.
[1] http://wiki.phpbb.com/display/DEV/Git
PHPBB3-9768
Moderators are redirected to the index page of the MCP after locking a post,
a better location would be to direct them back to the post details.
PHPBB3-7332
The MCP post details can be difficult to use if the post is particularly long
this change shrinks the post area to a maximum of 300 pixels, like the topic
review, making it easier to access the functions beneath the post content.
PHPBB3-7332
Wildcards without any further result restrictions will cause phpBB to search
for everything, potentially allowing a DoS attack against the DB server by any
user who can use the search system.
PHPBB3-9760
When magic_quotes_gpc is 'On' it also affects the $_FILES array and a filename
like 'bantu"s testfile.txt' will be returned as 'bantu\"s testfile.txt'.
Because utf8_basename() also strips off anything before the last backslash
the filename was returned as '"s testfile.txt'.
Calling stripslashes() before utf8_basename() solves the problem.
PHPBB3-9615
The native SQL Server plugin used to return an error string when calling
sql_error. However, some error condition checks are done using is_array.
This patch wraps the error into an array to follow the error logic used
elsewhere.
PHPBB3-9521
The template variable {HISTORY_TITLE} was always being set to the empty string.
It is now filled with the title of the currently displayed message. It is not
showed in prosilver or subsilver2 for aesthetic reasons (title is already
prominent)
PHPBB3-9757
The Fulltext_mysql class had different behavior when a dash was entered in the
search query than the fulltext_native class. Specifically, a dash was
automatically turned into boolean NOT even when the user wanted to search for
legitimate hyphenated words like farty-pants
PHPBB3-9749
The "notify user" check box would not do anything if checked in this case, but
it was still presented. The checkbox is now only shown if there are
notification options enabled.
PHPBB3-9679
dE() was defined differently in the ACP and in prosilver. Other javascript
in editor.js files has also been unified (taking the prosilver implementation
as cannonical)
PHPBB3-9499
