1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00

16009 Commits

Author SHA1 Message Date
Marc Alexander
4ad8fcbd58 [ticket/11404] Remove version ID from manager_test.php file header
PHPBB3-11404
2013-03-11 10:35:18 +01:00
Marc Alexander
fb1984dadb [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
PHPBB3-11404
2013-03-11 10:34:25 +01:00
Marc Alexander
2ec0dc5b34 [ticket/11404] Convert manager_test to UNIX line endings
PHPBB3-11404
2013-03-11 10:34:12 +01: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
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
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
David King
ce993cd56e Merge remote-tracking branch 'EXreaction/ticket/11402' into develop
# By Nathan Guse
# Via Nathan Guse
* EXreaction/ticket/11402:
  [ticket/11402] Fix undefined index in post/topic_in_queue
2013-03-05 14:42:31 -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
Nathaniel Guse
c1840c78c5 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3
Conflicts:
	phpBB/includes/db/migrator.php
2013-03-04 13:48:29 -06:00
David King
eb5075c80f Merge remote-tracking branch 'EXreaction/ticket/11395' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11395:
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
2013-03-04 14:42:12 -05:00
Nathaniel Guse
941b7287b7 Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop
# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [feature/avatars] Use "Main" as category for avatars in root of gallery
  [feature/avatars] Remove trailing whitespace from avatar code
  [feature/avatars] Pass phpbb_user to prepare and process form functions
  [feature/avatars] Document the use of the allowed extensions array
  [feature/avatars] Use array for allowed extensions and implode if needed
  [feature/avatars] Use deprecated for compatibility function
  [feature/avatars] Correct license, copyright and package info
  [feature/avatars] Move list of supported formats to avatar driver class
  [feature/avatars] Add include of functions_display.php in BC function
  [feature/avatars] Add note about when compatibility function was added
  [feature/avatars] Add compatibility function for get_user_avatar()
  [feature/avatars] Move definition of driver_collection to avatars.yml
  [feature/avatars] Remove the obsolete request argument for avatar drivers
  [feature/avatars] Add missing @var to docblocks in avatar manager
  [feature/avatars] Remove not needed inline style
  [feature/avatars] Differentiate tests for get drivers functions
  ...
2013-03-04 13:33:42 -06:00
Nathaniel Guse
029f096411 Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10411-2: (33 commits)
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  [ticket/10411] Add maxlength to category name input field
  [ticket/10411] Test for thrown exceptions when group does not exist
  [ticket/10411] Catch exceptions from grouppositions
  [ticket/10411] Throw exceptions instead of using trigger_error()
  [ticket/10411] Add return values to add/delete function
  [ticket/10411] Add return value to move functions
  [ticket/10411] Fix typehinting and change private to protected
  [ticket/10411] Use template loops instead of defining the html in php files
  [ticket/10411] Ensure we only get services that do exist
  [ticket/10411] Add a comment why we left join the group table
  [ticket/10411] Rename template variable CUR_ to CURRENT_
  [ticket/10411] Move globals to the top and use array for cache destroy
  [ticket/10411] Use new ajax callback name row_up/row_down
  [ticket/10411] Fix logic error when editing/creating a group
  ...
2013-03-04 13:25:53 -06:00
Andreas Fischer
5695097b8a Merge remote-tracking branch 'EXreaction/ticket/11396' into develop
* EXreaction/ticket/11396:
  [ticket/11396] Rename insert_migration to set_migration_state
2013-03-04 18:52:50 +01:00
Nathaniel Guse
071defded6 [ticket/11386] Fix missing ;
PHPBB3-11386
2013-03-04 09:55:23 -06:00
Joas Schilling
7423d48757 [ticket/10714] Get log from container in install, update and download/file
PHPBB3-10714
2013-03-04 11:25:27 +01:00
Marc Alexander
2e2ddd7e85 [feature/avatars] Update module_auth of ucp module and fix small issues
Reduced the check effectively_installed() to just checking for the config
entry "allow_avatar_gravatar". Also added the missing update of the
module_auth of the ucp_profile avatar mode.

PHPBB3-10018
2013-03-04 10:30:49 +01:00
Joas Schilling
e512ad6726 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (255 commits)
  [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
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
  [ticket/11363] Fix to make get_module_infos get from all extensions
  [ticket/11381] Make finder able to search in all available extensions
  [ticket/11103] Revert whitespace changes
  [ticket/11103] Few more minor language things
  [ticket/11103] Don't call generate_board_url many times
  [ticket/11103] Case time in queries as an int
  [ticket/11103] Fix effectively installed check
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
  [ticket/11103] Notifications Migration file
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/config/tables.yml
2013-03-04 05:11:32 +01:00
Nathaniel Guse
ae15fabb32 [ticket/11396] Rename insert_migration to set_migration_state
PHPBB3-11396
2013-03-03 20:59:21 -06:00
Nathaniel Guse
9dfc5fbf9a [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
PHPBB3-11395
2013-03-03 20:47:14 -06:00
Nathaniel Guse
6cad032fbb [ticket/11393] Give more information on database updater
PHPBB3-11393
2013-03-03 20:18:05 -06:00
Nathaniel Guse
e4f7828199 [ticket/11386] Send list of migrations instead of using load_migrations
Remove dependency of extension manager for migrator.

Keeping load_migrations function for others to use if they desire
but requiring the finder be sent to it in order to use it.

PHPBB3-11386
2013-03-03 19:54:22 -06:00
Marc Alexander
c7ca4e445c [feature/avatars] Add migrations data file for avatars
The module_auth of the ucp avatar settings are used for checking if the
migration has already been installed.

PHPBB3-10018
2013-03-04 01:04:36 +01:00
Marc Alexander
e1bb76eb09 [feature/avatars] Reduce module auth of ucp avatar settings
Previously the avatar types that need to be enabled were hardcoded into
the module auth. This is no longer needed in the new avatar system.

PHPBB3-10018
2013-03-04 00:25:38 +01:00
Marc Alexander
d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2013-03-04 00:22:15 +01:00
Joas Schilling
e0328814f3 [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
PHPBB3-10714
2013-03-03 20:30:54 +01:00
Joas Schilling
46c4ff46e0 [ticket/10714] Logs are disabled for this page call only
PHPBB3-10714
2013-03-03 20:30:17 +01:00
Nathaniel Guse
bee4f8d818 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By Marc Alexander
# Via Marc Alexander (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/6723] Show info that message has been deleted before delivery
2013-03-02 17:50:31 -06:00
Nathaniel Guse
fb371d6bbe Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympus
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/6723:
  [ticket/6723] Show info that message has been deleted before delivery
2013-03-02 17:48:56 -06:00
Nathaniel Guse
e33c8e2bb6 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/11368] Fix background color for PM report rows by using accessing var.
2013-03-02 17:45:18 -06:00
Nathaniel Guse
d5617f046c Merge remote-tracking branch 'remotes/bantu/ticket/11368' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11368:
  [ticket/11368] Fix background color for PM report rows by using accessing var.
2013-03-02 17:43:49 -06:00
Marc Alexander
acabe6f5ca [ticket/6723] Show info that message has been deleted before delivery
If the message has been deleted before the delivery it will still show in
the message history, although with an empty message. This patch will
change that behavior to showing the info that it has been deleted before
it was delivered in red letters. The red letters ensure that users won't
mistake the info for the actual message.

PHPBB3-6723
2013-03-03 00:32:31 +01:00
David King
e08edd36b9 Merge remote-tracking branch 'EXreaction/ticket/11386' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386:
  [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
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
2013-03-02 17:12:43 -05:00
Nathaniel Guse
9fca8f88fa Merge branch 'ticket/11385' into develop
# By OpenShift guest
* ticket/11385:
  [ticket/11385] Fix issue with migration module tool not getting extension module info
2013-03-02 15:44:16 -06:00
OpenShift guest
c73f0a7c78 [ticket/11385] Fix issue with migration module tool not getting extension module info
PHPBB3-11385
2013-03-02 15:43:42 -06:00
Nathaniel Guse
91be998223 [ticket/11386] Fix failing tests from constructor changes
PHPBB3-11386
2013-03-02 15:18:07 -06:00
Nathaniel Guse
59638a6a7d Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386
Conflicts:
	phpBB/includes/extension/finder.php
2013-03-02 14:48:44 -06:00
Nathaniel Guse
a6f877c0d8 [ticket/11386] Fix circular reference error & serialize error
PHPBB3-11386
2013-03-02 14:15:59 -06:00
Nathaniel Guse
024c21f30d [ticket/11386] Remove tests that check if finder cache is working
These don't seem necessary and are much more complicated to get
working now with the changes in this PR

PHPBB3-11386
2013-03-02 13:47:41 -06:00
Nathaniel Guse
1368470f74 [ticket/11386] Forgot to get the migration classes
PHPBB3-11386
2013-03-02 11:42:30 -06:00
Nathaniel Guse
8415ae839c [ticket/11386] Update tests with new constructors for ext.manager/migrator
PHPBB3-11386
2013-03-02 11:37:58 -06:00
Nathaniel Guse
39ca212e17 [ticket/11386] Use finder to find migration files
PHPBB3-11386
2013-03-02 11:12:12 -06:00
David King
4670ffe90c Merge remote-tracking branch 'EXreaction/ticket/11363-2' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11363-2:
  [ticket/11363] Fix to make get_module_infos get from all extensions
2013-03-01 15:02:20 -05:00