Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch.
PHPBB3-10762
With that php.ini value set errors are printed to stderr, therefore
by redirecting stderr to /dev/null we also throw out the errors.
Instead merge stderr into stdout.
PHPBB3-10760
/bin/echo on freebsd and dash's builtin echo do not understand -e,
therefore -e is printed with the other messages in such cases.
Test if echo understands -e, if not do not use it.
PHPBB3-10760
We have a PHP_BIN variable but we always set it unconditionally,
therefore in order to use a different php binary one had to
modify the hook script.
Instead set PHP_BIN if it is not set.
Now one can set PHP_BIN in their environment to use a non-default
php binary.
PHPBB3-10760
* develop-olympus:
[ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
[ticket/10658] Use get_user_rank() for group ranks on group view.
* bantu/ticket/10658:
[ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
[ticket/10658] Use get_user_rank() for group ranks on group view.
A form exploit enabled the users to select a deactivated
style. Fixed with extra check on submit, with a new function
styles_verify to check if the selected style is activated or not.
PHPBB3-10561
* github-cyberalien/ticket/10752:
[ticket/10752] Fixes for acp_styles
[ticket/10752] Changing private to protected variables in acp_styles
[ticket/10752] More fixes for acp_styles
[ticket/10752] Pass-by-reference fix for acp_styles
[ticket/10752] Removing globals acp_styles
* develop-olympus:
[ticket/10699] Long h2 title breaks div.minitabs in MCP
[ticket/10699] Long h2 title breaks div.minitabs in MCP
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both
PHPBB3-10699
Changed the styling of smilies to appear at the same level as
text, by adding vertical-align: text-bottom css property to all
smilies. Edited functions_content.php to add class="smilies"
to all parsed smilies.
PHPBB3-10438
* cyberalien/ticket/10665:
[ticket/10665] Adding includejs to acp templates
[ticket/10665] Solution for T_SUPER_TEMPLATE_PATH
[ticket/10665] New test class for templates with tree
[ticket/10665] Changing template->_js_include to public
[ticket/10665] Moving filter parameters to one array
[ticket/10665] INCLUDEJS unit test
[ticket/10665] Changing template compiler test
[ticket/10665] INCLUDEJS template changes
[ticket/10665] INCLUDEJS template tag
Temporary solution for T_SUPER_TEMPLATE_PATH pointing to wrong directory, variable will be completely removed later because it will be obsolete
PHPBB3-10665
* upstream/develop:
[ticket/10733] Fixing test
[ticket/10733] Removing static from data providers
[ticket/10731] Fixed addquote() to work on opera browser.
[ticket/10731] Fixed addquote() to work on opera browser.
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
[ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
[ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
[ticket/10675] Add disk full language string when posting attachments