diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-02-26 15:47:16 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-02-26 15:47:16 +0100 |
| commit | af23811c6d66d5d824563ed8c09f3bcfbba8aa71 (patch) | |
| tree | 93a6448fa9c6db63dea374b50374962ba46d0c88 /phpBB/includes/diff | |
| parent | 2f916233924eb378cc9d03958dfc7da30d45814d (diff) | |
| parent | 8910ec98d7aa685d497841e4c60473ca205ec355 (diff) | |
| download | forums-af23811c6d66d5d824563ed8c09f3bcfbba8aa71.tar forums-af23811c6d66d5d824563ed8c09f3bcfbba8aa71.tar.gz forums-af23811c6d66d5d824563ed8c09f3bcfbba8aa71.tar.bz2 forums-af23811c6d66d5d824563ed8c09f3bcfbba8aa71.tar.xz forums-af23811c6d66d5d824563ed8c09f3bcfbba8aa71.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10532] Remove unnecessary parentheses around calculations of addition.
[ticket/10532] Remove one unnecessary level of if block nesting.
[ticket/10532] Get rid of inline calculation of $start, remove duplicated check
[ticket/10532] Put $total_match_count assignment onto its own line.
[ticket/10532] Adjust total match count and limit
[ticket/10532] Fix $start out of range for pre-made searches
Conflicts:
phpBB/search.php
Diffstat (limited to 'phpBB/includes/diff')
0 files changed, 0 insertions, 0 deletions