We need to correctly remove ../ form the path if possible by removing the
previous folder aswell. Otherwise the finder is unable to locate /adm/style
directories in extensions as he is looking for /adm/../adm/style instead.
PHPBB3-11362
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11404:
[ticket/11404] Remove version ID from manager_test.php file header
[ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
[ticket/11404] Convert manager_test to UNIX line endings
[ticket/11404] Use a default data row if $row is empty in clean_row()
[ticket/11404] Return empty array of avatar data if $row is empty
When viewing a private message, when message edit count is 1
Undefined index EDITED_TIME_TOTAL php notice appears. Changed
the message formatting method to what is used in viewtopic.php.
PHPBB3-11106
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
[ticket/11303] rename attribute to timezone-preselect
[ticket/11303] remove additional brackets
[ticket/11303] use S_TZ_PRESELECT in subsilver
[ticket/11303] add S_TZ_PRESELECT template var
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11323:
[ticket/11323] Reduce additional code and revert regex to previous one
[ticket/11323] Enable tests for inclusion of defined variables
[ticket/11323] Correctly treat variables in template defines
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11390:
[ticket/11390] Correctly separate list of notifications from header
[ticket/11390] Hide pagination when there are no notifications
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/10202:
[ticket/10202] Rename method names _all() to _array().
[ticket/10202] Add migration file for config_db_text.
[ticket/10202] Upgrade TEXT to the bigger MTEXT.
[ticket/10202] Improve method documentation.
[ticket/10202] SQL escape the table name.
[ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
[ticket/10202] Define phpbb_config_db_text as a service.
[ticket/10202] Add tests for phpbb_config_db_text.
[ticket/10202] Adjust method names to guidelines.
[ticket/10202] Add database schema for phpbb_config_db_text.
[ticket/10202] Implementation of config options with arbitrary length values.
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11166:
[ticket/11166] Add ajaxify support to normal ACP confirm_box()
[ticket/11166] Fix several custom confirm templates in prosilver
[ticket/11166] Add caption to AJAX confirm box default template
[ticket/11166] Fix typo in comment
[ticket/11166] Use provided custom templates on AJAX confirm box
While creating a group in the acp, the group data ($group_row) is empty.
Due to that array_combine in phpbb_avatar_manager::clean_row() will cause
PHP Warnings. In addition to that the required indexes 'avatar',
'avatar_width', 'avatar_height', and 'avatar_type' won't be defined. This
patch will solve that issue.
PHPBB3-11404
* 'develop' of https://github.com/phpbb/phpbb3: (799 commits)
[ticket/11402] Fix undefined index in post/topic_in_queue
[ticket/11400] If email is disabled, disable it for notifications
[ticket/11398] Correctly call permission_set method in permission tool
[ticket/11394] Relax Migration Tools
[ticket/11386] Fix missing ;
[ticket/10714] Get log from container in install, update and download/file
[feature/avatars] Update module_auth of ucp module and fix small issues
[ticket/11396] Rename insert_migration to set_migration_state
[ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
[ticket/11393] Give more information on database updater
[ticket/11386] Send list of migrations instead of using load_migrations
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/6723] Show info that message has been deleted before delivery
[ticket/11385] Fix issue with migration module tool not getting extension module info
[ticket/11386] Fix failing tests from constructor changes
[ticket/11386] Fix circular reference error & serialize error
[ticket/11386] Remove tests that check if finder cache is working
...
Conflicts:
phpBB/assets/javascript/core.js
