Even though the coding guidelines document prescribes "commas after every
array element", it contains several example code fragments with array elements
not terminated by a comma. This commit fixes that.
PHPBB3-11794
* prep-release-3.0.12:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
* 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3:
[ticket/11753] Remove ?> from MySQL Upgrader.
[ticket/11753] Update MySQL upgrader schema data.
[ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
[ticket/11752] HTTP -> HTTPs in email/installed.txt
* prep-release-3.0.12:
[prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC2.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
The variable $this->unequal_version was only used once
and only to display the version the package updates to.
To display the version it updates to makes no sense when
the update files just aren't meant to update from the
current version. (It's already shown in an error message)
So I deleted the variable from there.
Furthermore the use of version_compare makes the variable
useless in that context which is why I deleted the variable
from the whole file and replaced it in the relevant if statement
with the old comparison.
PHPBB3-10917
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/10917:
[ticket/10917] Using phpbb wrapper
[ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/11062:
[ticket/11062] If user's language is english there is no further work needed
[ticket/11062] Load new strings from user's language file if provided
* prep-release-3.0.12:
[ticket/11720] Add functional test for submitting report as user
[ticket/11720] Do not call $captcha->validate if $captcha is not set
* marc1706/ticket/11720-prep-release:
[ticket/11720] Add functional test for submitting report as user
[ticket/11720] Do not call $captcha->validate if $captcha is not set
PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.
PHPBB3-11720
# By Nathaniel Guse (1) and Nils Adermann (1)
* prep-release-3.0.12:
[ticket/11671] Update composer.lock
[ticket/11671] Add phing as a dependency and upgrade deps