1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

14600 Commits

Author SHA1 Message Date
Marc Alexander
aefca4b40f [ticket/11465] Use extension finder when adding extensions' acp modules
The method acp_modules::get_module_infos() needs to use the extension
finder whenever it is looking for a module's info file. While
transitioning to the new extension system, only the initial search for all
module info files was changed to the new system. Due to this it is not
possible to add an extension's acp/mcp/ucp module manually in the ACP.
This patch will always use the extension finder for the acp module's info
files and therefore properly find the needed file. Additionally, the code
has been cleaned up a little bit.

PHPBB3-11465
2013-03-21 14:59:53 +01:00
Oleg Pudeyev
8b464e87f0 Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11438:
  [ticket/11438] Add spaces after # comment start and before \ line breaks
  [ticket/11438] Add helpful comments from sample config to ACP output
  [ticket/11438] Add empty sql_query_pre to delta-source
  [ticket/11438] Move backslash to concatenate the query strings correctly
  [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
2013-03-20 11:43:14 -04:00
Andreas Fischer
76262f186f [ticket/11455] Restore alphabetic order (underscore first) in config/tables.yml
PHPBB3-11455
2013-03-17 18:31:49 +01:00
Joas Schilling
c50af28077 [ticket/11438] Add spaces after # comment start and before \ line breaks
PHPBB3-11438
2013-03-16 01:18:15 +01:00
Joas Schilling
2b2bbf787c [ticket/11438] Add helpful comments from sample config to ACP output
PHPBB3-11438
2013-03-15 08:23:39 +01:00
Joas Schilling
ef63c2db8b [ticket/11438] Add empty sql_query_pre to delta-source
PHPBB3-11438
2013-03-15 08:19:50 +01:00
Joas Schilling
8fe776dff7 [ticket/11438] Move backslash to concatenate the query strings correctly
Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88

PHPBB3-11438
2013-03-15 08:16:37 +01:00
Joas Schilling
dc7afd05eb [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
PHPBB3-11438
2013-03-15 08:06:45 +01:00
Nathan Guse
d4ee7718b9 Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop
# 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
2013-03-12 14:48:07 -05:00
Nathan Guse
739dbd9e31 Merge remote-tracking branch 'remotes/Marc/ticket/11433' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11433:
  [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
2013-03-12 14:41:54 -05:00
Joas Schilling
5eef287646 [ticket/11310] Add hashes to action links to prevent CSRF attacks
PHPBB3-11310
2013-03-12 17:19:30 +01:00
Marc Alexander
d378f5ac32 [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
This missing change caused the loading info to appear during ajax
requests. With this patch it will be properly hidden as it should.

PHPBB3-11433
2013-03-12 15:15:21 +01:00
Nathaniel Guse
d6930df7a2 Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop
# 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
2013-03-09 19:08:51 -06:00
Nathaniel Guse
3f5d938a95 Merge remote-tracking branch 'remotes/marc/ticket/11323' into develop
# 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
2013-03-09 19:02:44 -06:00
Nathaniel Guse
48bad80f4a Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop
# By OpenShift guest
# Via OpenShift guest
* remotes/Blitze/ticket/11383:
  [ticket/11383] Correctly revert modules added/removed by migrator
2013-03-09 18:33:19 -06:00
Nathaniel Guse
36de18e174 [ticket/11423] Send unformatted usernames to the email template
PHPBB3-11423
2013-03-09 09:12:46 -06:00
Nathan Guse
7bb32d27ac Merge remote-tracking branch 'remotes/nickv/ticket/11421' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11421:
  [ticket/11421] Correctly display submit button when needed
2013-03-07 11:33:33 -06:00
Nathan Guse
683e17c403 Merge remote-tracking branch 'remotes/nickv/ticket/11417' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11417:
  [ticket/11417] FIx submit button description on notifications options page
2013-03-07 11:33:02 -06:00
Nathan Guse
e826edb6fe Merge remote-tracking branch 'remotes/nickv/ticket/11390' into develop
# 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
2013-03-07 11:32:17 -06:00
Marc Alexander
bb58462724 [ticket/11404] Use a default data row if $row is empty in clean_row()
A statically defined $default_row will be used inside the
phpbb_avatar_manager::clean_row() method if the $row passed to it is
empty.

PHPBB3-11404
2013-03-07 13:03:27 +01:00
Joas Schilling
d219eafa16 [ticket/11407] Fix <dfn> description of "notification" option.
PHPBB3-11407
2013-03-07 12:18:53 +01:00
Joas Schilling
7ac945358e [ticket/11390] Correctly separate list of notifications from header
PHPBB3-11390
2013-03-07 11:39:55 +01:00
Joas Schilling
899d857929 [ticket/11390] Hide pagination when there are no notifications
PHPBB3-11390
2013-03-07 11:39:33 +01:00
Joas Schilling
2caf7fbf12 [ticket/11417] FIx submit button description on notifications options page
PHPBB3-11417
2013-03-07 11:30:02 +01:00
Joas Schilling
300a42f5b8 [ticket/11421] Correctly display submit button when needed
PHPBB3-11421
2013-03-07 11:14:01 +01:00
David King
d658d6640b Merge remote-tracking branch 'EXreaction/ticket/11408' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11408:
  [ticket/11408] user_jabber instead of jabber
2013-03-06 17:01:30 -05:00
Nathan Guse
9ca15267fa Merge remote-tracking branch 'remotes/bantu/ticket/10202' into develop
# 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.
2013-03-06 15:36:15 -06:00
Nathaniel Guse
3aab72d79b [ticket/11408] user_jabber instead of jabber
PHPBB3-11408
2013-03-06 09:53:41 -06:00
Marc Alexander
5963905825 [ticket/11404] Return empty array of avatar data if $row is empty
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
2013-03-06 11:32:23 +01:00
Joas Schilling
0bbde4c122 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166
* '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
2013-03-06 07:35:47 +01:00
Andreas Fischer
32ff2348f1 [ticket/10202] Rename method names _all() to _array().
PHPBB3-10202
2013-03-05 23:15:46 +01:00
Andreas Fischer
3a4b34ca32 [ticket/10202] Add migration file for config_db_text.
PHPBB3-10202
2013-03-05 22:59:58 +01:00
Andreas Fischer
5158224845 [ticket/10202] Upgrade TEXT to the bigger MTEXT.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
0071ad3bfd [ticket/10202] Improve method documentation.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
af02681960 [ticket/10202] SQL escape the table name.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
95764c4f0e [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
722092fe54 [ticket/10202] Define phpbb_config_db_text as a service.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
a73b76cb24 [ticket/10202] Adjust method names to guidelines.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
3a5d3bdd68 [ticket/10202] Add database schema for phpbb_config_db_text.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
50b557ca4e [ticket/10202] Implementation of config options with arbitrary length values.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
David King
597c16a936 Merge remote-tracking branch 'EXreaction/ticket/11400' into develop
# By Nathan Guse
# Via Nathan Guse
* EXreaction/ticket/11400:
  [ticket/11400] If email is disabled, disable it for notifications
2013-03-05 14:46:58 -05:00
Nathan Guse
0eb6f56a9a [ticket/11402] Fix undefined index in post/topic_in_queue
PHPBB3-11402
2013-03-05 11:46:58 -06:00
Nathan Guse
ab4c1b5d0c [ticket/11400] If email is disabled, disable it for notifications
PHPBB3-11400
2013-03-05 10:28:52 -06:00
Nathaniel Guse
2bf98dcead Merge remote-tracking branch 'remotes/marc/ticket/11398' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11398:
  [ticket/11398] Correctly call permission_set method in permission tool
2013-03-04 18:13:48 -06:00
Nathaniel Guse
cb4bd3f881 Merge remote-tracking branch 'remotes/nickv/ticket/10714' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10714: (56 commits)
  [ticket/10714] Get log from container in install, update and download/file
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/10714] Update add_log docs block with @param and @deprecated
  [ticket/10714] Remove fallback code from previous commits and move global
  [ticket/10714] Fix missing parameter and global phpbb_log in unit tests
  [ticket/10714] Add getter for is_in_admin and use it
  [ticket/10714] Fix more comments
  [ticket/10714] Cast values to integer before using them in the query
  [ticket/10714] Fix several doc blocks and comments
  [ticket/10714] Fix missing 8th argument in unit tests
  [ticket/10714] Use new core.adm_relative_path to create the object.
  [ticket/10714] Fix several comments and variable names
  [ticket/10714] Fix database driver class name
  [ticket/10714] Forgot most important, use container to create $phpbb_log
  [ticket/10714] Remove type hinting to allow the usage of mocks in tests
  [ticket/10714] Fix dependency injections in unit tests with mocks
  [ticket/10714] Use dependencies instead of globals
  [ticket/10714] Compare log_type to false, rather then null
  [ticket/10714] Add global variables for the unit tests
  ...
2013-03-04 18:11:42 -06:00
Marc Alexander
e7d9cfa009 [ticket/11398] Correctly call permission_set method in permission tool
The permission_set method calls itself inside the permission tool.
Probably due to an oversight, it is called as $this->set(), which causes a
fatal error. This patch will get rid of this issue.

PHPBB3-11398
2013-03-05 01:06:22 +01:00
David King
1148f3fca5 Merge remote-tracking branch 'EXreaction/ticket/11386-3' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386-3:
  [ticket/11386] Fix missing ;
  [ticket/11386] Send list of migrations instead of using load_migrations
2013-03-04 15:22:29 -05:00
David King
1a8f72fd65 Merge remote-tracking branch 'EXreaction/ticket/11394' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11394:
  [ticket/11394] Relax Migration Tools
2013-03-04 15:10:48 -05:00
Nathaniel Guse
2aadc5a22c [ticket/11394] Relax Migration Tools
Do not throw as many exceptions in the migration tools (when something
unexpected occurs but can be safely ignored).

PHPBB3-11394
2013-03-04 14:06:52 -06:00
David King
e652c078e6 Merge remote-tracking branch 'EXreaction/ticket/11393' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11393:
  [ticket/11393] Give more information on database updater
2013-03-04 14:51:00 -05:00